summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/webui/settings/settings_default_browser_handler.h
diff options
context:
space:
mode:
authorpmonette <pmonette@chromium.org>2016-02-09 16:12:19 -0800
committerCommit bot <commit-bot@chromium.org>2016-02-10 00:13:46 +0000
commit9fa59e8809740d5364b46e81f5503d1c7c90dd57 (patch)
treed759b3796e15c92bb03d91d4447a6f9d37dcdd1d /chrome/browser/ui/webui/settings/settings_default_browser_handler.h
parent3497c50c52256d5f397579faf9c983d835c38d1d (diff)
downloadchromium_src-9fa59e8809740d5364b46e81f5503d1c7c90dd57.zip
chromium_src-9fa59e8809740d5364b46e81f5503d1c7c90dd57.tar.gz
chromium_src-9fa59e8809740d5364b46e81f5503d1c7c90dd57.tar.bz2
ShellIntegration is now a proper namespace.
This will make it easier to add code to the unnamed namespace in shell_integration.cc without prefixing everything with ShellIntegration::. Review URL: https://codereview.chromium.org/1682613002 Cr-Commit-Position: refs/heads/master@{#374541}
Diffstat (limited to 'chrome/browser/ui/webui/settings/settings_default_browser_handler.h')
-rw-r--r--chrome/browser/ui/webui/settings/settings_default_browser_handler.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/chrome/browser/ui/webui/settings/settings_default_browser_handler.h b/chrome/browser/ui/webui/settings/settings_default_browser_handler.h
index 57354db..e7b8a2d 100644
--- a/chrome/browser/ui/webui/settings/settings_default_browser_handler.h
+++ b/chrome/browser/ui/webui/settings/settings_default_browser_handler.h
@@ -26,7 +26,7 @@ namespace settings {
// settings code to change the default browser settings.
class DefaultBrowserHandler
: public SettingsPageUIHandler,
- public ShellIntegration::DefaultWebClientObserver {
+ public shell_integration::DefaultWebClientObserver {
public:
explicit DefaultBrowserHandler(content::WebUI* webui);
~DefaultBrowserHandler() override;
@@ -34,9 +34,9 @@ class DefaultBrowserHandler
// SettingsPageUIHandler implementation.
void RegisterMessages() override;
- // ShellIntegration::DefaultWebClientObserver implementation.
+ // shell_integration::DefaultWebClientObserver implementation.
void SetDefaultWebClientUIState(
- ShellIntegration::DefaultWebClientUIState state) override;
+ shell_integration::DefaultWebClientUIState state) override;
bool IsInteractiveSetDefaultPermitted() override;
void OnSetAsDefaultConcluded(bool succeeded) override;
@@ -48,7 +48,8 @@ class DefaultBrowserHandler
void SetAsDefaultBrowser(const base::ListValue* args);
// Reference to a background worker that handles default browser settings.
- scoped_refptr<ShellIntegration::DefaultBrowserWorker> default_browser_worker_;
+ scoped_refptr<shell_integration::DefaultBrowserWorker>
+ default_browser_worker_;
// Policy setting to determine if default browser setting is managed.
BooleanPrefMember default_browser_policy_;