Reorder functions in implementations files for shell_execute.h
The style guide mandates the definition of the functions to match the
order in the declaration file.
Review URL: https://codereview.chromium.org/1378613002
Cr-Commit-Position: refs/heads/master@{#352126}
diff --git a/chrome/browser/shell_integration_win.cc b/chrome/browser/shell_integration_win.cc
index 07f7b4b..a27448c 100644
--- a/chrome/browser/shell_integration_win.cc
+++ b/chrome/browser/shell_integration_win.cc
@@ -242,19 +242,6 @@
} // namespace
-ShellIntegration::DefaultWebClientSetPermission
- ShellIntegration::CanSetAsDefaultBrowser() {
- BrowserDistribution* distribution = BrowserDistribution::GetDistribution();
- if (distribution->GetDefaultBrowserControlPolicy() !=
- BrowserDistribution::DEFAULT_BROWSER_FULL_CONTROL)
- return SET_DEFAULT_NOT_ALLOWED;
-
- if (ShellUtil::CanMakeChromeDefaultUnattended())
- return SET_DEFAULT_UNATTENDED;
- else
- return SET_DEFAULT_INTERACTIVE;
-}
-
bool ShellIntegration::SetAsDefaultBrowser() {
base::FilePath chrome_exe;
if (!PathService::Get(base::FILE_EXE, &chrome_exe)) {
@@ -274,6 +261,23 @@
return true;
}
+bool ShellIntegration::SetAsDefaultBrowserInteractive() {
+ base::FilePath chrome_exe;
+ if (!PathService::Get(base::FILE_EXE, &chrome_exe)) {
+ NOTREACHED() << "Error getting app exe path";
+ return false;
+ }
+
+ BrowserDistribution* dist = BrowserDistribution::GetDistribution();
+ if (!ShellUtil::ShowMakeChromeDefaultSystemUI(dist, chrome_exe)) {
+ LOG(ERROR) << "Failed to launch the set-default-browser Windows UI.";
+ return false;
+ }
+
+ VLOG(1) << "Set-default-browser Windows UI completed.";
+ return true;
+}
+
bool ShellIntegration::SetAsDefaultProtocolClient(const std::string& protocol) {
if (protocol.empty())
return false;
@@ -297,23 +301,6 @@
return true;
}
-bool ShellIntegration::SetAsDefaultBrowserInteractive() {
- base::FilePath chrome_exe;
- if (!PathService::Get(base::FILE_EXE, &chrome_exe)) {
- NOTREACHED() << "Error getting app exe path";
- return false;
- }
-
- BrowserDistribution* dist = BrowserDistribution::GetDistribution();
- if (!ShellUtil::ShowMakeChromeDefaultSystemUI(dist, chrome_exe)) {
- LOG(ERROR) << "Failed to launch the set-default-browser Windows UI.";
- return false;
- }
-
- VLOG(1) << "Set-default-browser Windows UI completed.";
- return true;
-}
-
bool ShellIntegration::SetAsDefaultProtocolClientInteractive(
const std::string& protocol) {
base::FilePath chrome_exe;
@@ -334,22 +321,23 @@
return true;
}
+ShellIntegration::DefaultWebClientSetPermission
+ ShellIntegration::CanSetAsDefaultBrowser() {
+ BrowserDistribution* distribution = BrowserDistribution::GetDistribution();
+ if (distribution->GetDefaultBrowserControlPolicy() !=
+ BrowserDistribution::DEFAULT_BROWSER_FULL_CONTROL)
+ return SET_DEFAULT_NOT_ALLOWED;
+
+ if (ShellUtil::CanMakeChromeDefaultUnattended())
+ return SET_DEFAULT_UNATTENDED;
+ else
+ return SET_DEFAULT_INTERACTIVE;
+}
+
bool ShellIntegration::IsElevationNeededForSettingDefaultProtocolClient() {
return base::win::GetVersion() < base::win::VERSION_WIN8;
}
-ShellIntegration::DefaultWebClientState ShellIntegration::GetDefaultBrowser() {
- return GetDefaultWebClientStateFromShellUtilDefaultState(
- ShellUtil::GetChromeDefaultState());
-}
-
-ShellIntegration::DefaultWebClientState
- ShellIntegration::IsDefaultProtocolClient(const std::string& protocol) {
- return GetDefaultWebClientStateFromShellUtilDefaultState(
- ShellUtil::GetChromeDefaultProtocolClientState(
- base::UTF8ToUTF16(protocol)));
-}
-
base::string16 ShellIntegration::GetApplicationNameForProtocol(
const GURL& url) {
// Windows 8 or above requires a new protocol association query.
@@ -359,6 +347,11 @@
return GetAppForProtocolUsingRegistry(url);
}
+ShellIntegration::DefaultWebClientState ShellIntegration::GetDefaultBrowser() {
+ return GetDefaultWebClientStateFromShellUtilDefaultState(
+ ShellUtil::GetChromeDefaultState());
+}
+
// There is no reliable way to say which browser is default on a machine (each
// browser can have some of the protocols/shortcuts). So we look for only HTTP
// protocol handler. Even this handler is located at different places in
@@ -392,6 +385,13 @@
return ff_default;
}
+ShellIntegration::DefaultWebClientState
+ ShellIntegration::IsDefaultProtocolClient(const std::string& protocol) {
+ return GetDefaultWebClientStateFromShellUtilDefaultState(
+ ShellUtil::GetChromeDefaultProtocolClientState(
+ base::UTF8ToUTF16(protocol)));
+}
+
base::string16 ShellIntegration::GetAppModelIdForProfile(
const base::string16& app_name,
const base::FilePath& profile_path) {
