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}

1 files changed, 13 insertions, 11 deletions

diff --git a/chrome/browser/ui/webui/set_as_default_browser_ui.cc b/chrome/browser/ui/webui/set_as_default_browser_ui.cc
index eac291a..55fed3b 100644
--- a/chrome/browser/ui/webui/set_as_default_browser_ui.cc
+++ b/chrome/browser/ui/webui/set_as_default_browser_ui.cc
@@ -96,7 +96,7 @@ class ResponseDelegate {
 class SetAsDefaultBrowserHandler
     : public WebUIMessageHandler,
       public base::SupportsWeakPtr<SetAsDefaultBrowserHandler>,
-      public ShellIntegration::DefaultWebClientObserver {
+      public shell_integration::DefaultWebClientObserver {
  public:
   explicit SetAsDefaultBrowserHandler(
       const base::WeakPtr<ResponseDelegate>& response_delegate);
@@ -105,9 +105,9 @@ class SetAsDefaultBrowserHandler
   // WebUIMessageHandler implementation.
   void RegisterMessages() override;
 
-  // ShellIntegration::DefaultWebClientObserver implementation.
+  // shell_integration::DefaultWebClientObserver implementation.
   void SetDefaultWebClientUIState(
-      ShellIntegration::DefaultWebClientUIState state) override;
+      shell_integration::DefaultWebClientUIState state) override;
   void OnSetAsDefaultConcluded(bool close_chrome) override;
   bool IsInteractiveSetDefaultPermitted() override;
 
@@ -118,7 +118,8 @@ class SetAsDefaultBrowserHandler
   // Close this web ui.
   void ConcludeInteraction(MakeChromeDefaultResult interaction_result);
 
-  scoped_refptr<ShellIntegration::DefaultBrowserWorker> default_browser_worker_;
+  scoped_refptr<shell_integration::DefaultBrowserWorker>
+      default_browser_worker_;
   bool set_default_returned_;
   bool set_default_result_;
   base::WeakPtr<ResponseDelegate> response_delegate_;
@@ -128,10 +129,11 @@ class SetAsDefaultBrowserHandler
 
 SetAsDefaultBrowserHandler::SetAsDefaultBrowserHandler(
     const base::WeakPtr<ResponseDelegate>& response_delegate)
-    : default_browser_worker_(new ShellIntegration::DefaultBrowserWorker(this)),
-      set_default_returned_(false), set_default_result_(false),
-      response_delegate_(response_delegate) {
-}
+    : default_browser_worker_(
+          new shell_integration::DefaultBrowserWorker(this)),
+      set_default_returned_(false),
+      set_default_result_(false),
+      response_delegate_(response_delegate) {}
 
 SetAsDefaultBrowserHandler::~SetAsDefaultBrowserHandler() {
   default_browser_worker_->ObserverDestroyed();
@@ -145,18 +147,18 @@ void SetAsDefaultBrowserHandler::RegisterMessages() {
 }
 
 void SetAsDefaultBrowserHandler::SetDefaultWebClientUIState(
-    ShellIntegration::DefaultWebClientUIState state) {
+    shell_integration::DefaultWebClientUIState state) {
   // The callback is expected to be invoked once the procedure has completed.
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   if (!set_default_returned_)
     return;
 
-  if (state == ShellIntegration::STATE_NOT_DEFAULT && set_default_result_) {
+  if (state == shell_integration::STATE_NOT_DEFAULT && set_default_result_) {
     // The operation concluded, but Chrome is still not the default.
     // If the call has succeeded, this suggests user has decided not to make
     // chrome the default.
     ConcludeInteraction(MAKE_CHROME_DEFAULT_REGRETTED);
-  } else if (state == ShellIntegration::STATE_IS_DEFAULT) {
+  } else if (state == shell_integration::STATE_IS_DEFAULT) {
     ConcludeInteraction(MAKE_CHROME_DEFAULT_ACCEPTED);
   }