[sessions] Properly namespace recently-componentized TabRestore code

chrome/browser/ui/browser_command_controller.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_UI_BROWSER_COMMAND_CONTROLLER_H_
 #define CHROME_BROWSER_UI_BROWSER_COMMAND_CONTROLLER_H_
 
 #include <vector>
 
 #include "base/prefs/pref_change_registrar.h"
 #include "base/prefs/pref_member.h"
 #include "chrome/browser/command_updater.h"
 #include "chrome/browser/command_updater_delegate.h"
 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
 #include "components/sessions/core/tab_restore_service_observer.h"
 #include "ui/base/window_open_disposition.h"
 
 class Browser;
 class BrowserWindow;
 class Profile;
 
 namespace content {
 struct NativeWebKeyboardEvent;
 }
 
 namespace chrome {
 
 class BrowserCommandController : public CommandUpdaterDelegate,
                                  public TabStripModelObserver,
-                                 public TabRestoreServiceObserver {
+                                 public sessions::TabRestoreServiceObserver {
  public:
   explicit BrowserCommandController(Browser* browser);
   ~BrowserCommandController() override;
 
   CommandUpdater* command_updater() { return &command_updater_; }
   bool block_command_execution() const { return block_command_execution_; }
 
   // Returns true if |command_id| is a reserved command whose keyboard shortcuts
   // should not be sent to the renderer or |event| was triggered by a key that
   // we never want to send to the renderer.
@@ skipping 47 matching lines @@
                      bool foreground) override;
   void TabDetachedAt(content::WebContents* contents, int index) override;
   void TabReplacedAt(TabStripModel* tab_strip_model,
                      content::WebContents* old_contents,
                      content::WebContents* new_contents,
                      int index) override;
   void TabBlockedStateChanged(content::WebContents* contents,
                               int index) override;
 
   // Overridden from TabRestoreServiceObserver:
-  void TabRestoreServiceChanged(TabRestoreService* service) override;
-  void TabRestoreServiceDestroyed(TabRestoreService* service) override;
-  void TabRestoreServiceLoaded(TabRestoreService* service) override;
+  void TabRestoreServiceChanged(sessions::TabRestoreService* service) override;
+  void TabRestoreServiceDestroyed(
+      sessions::TabRestoreService* service) override;
+  void TabRestoreServiceLoaded(sessions::TabRestoreService* service) override;
 
   // Returns true if the regular Chrome UI (not the fullscreen one and
   // not the single-tab one) is shown. Used for updating window command states
   // only. Consider using SupportsWindowFeature if you need the mentioned
   // functionality anywhere else.
   bool IsShowingMainUI();
 
   // Initialize state for all browser commands.
   void InitCommandState();
 
@@ skipping 75 matching lines @@
   PrefChangeRegistrar profile_pref_registrar_;
   PrefChangeRegistrar local_pref_registrar_;
   BooleanPrefMember pref_signin_allowed_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserCommandController);
 };
 
 }  // namespace chrome
 
 #endif  // CHROME_BROWSER_UI_BROWSER_COMMAND_CONTROLLER_H_