Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1089)

Unified Diff: chrome/browser/ui/gtk/browser_window_gtk.h

Issue 14622003: components: Move PrefRegistrySyncable into user_prefs namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixes Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/gtk/browser_window_gtk.h
diff --git a/chrome/browser/ui/gtk/browser_window_gtk.h b/chrome/browser/ui/gtk/browser_window_gtk.h
index 7d4f6b26707a18df3ccd4f9f0ab54b345946289a..5ff445fde3f477685767453334cc059fb388623d 100644
--- a/chrome/browser/ui/gtk/browser_window_gtk.h
+++ b/chrome/browser/ui/gtk/browser_window_gtk.h
@@ -40,7 +40,6 @@ class GlobalMenuBar;
class InfoBarContainerGtk;
class InstantOverlayControllerGtk;
class LocationBar;
-class PrefRegistrySyncable;
class StatusBubbleGtk;
class TabContentsContainerGtk;
class TabStripGtk;
@@ -54,17 +53,19 @@ class ActiveTabPermissionGranter;
class Extension;
}
-// An implementation of BrowserWindow for GTK.
-// Cross-platform code will interact with this object when
-// it needs to manipulate the window.
-
-class BrowserWindowGtk
- : public BrowserWindow,
- public content::NotificationObserver,
- public TabStripModelObserver,
- public ui::ActiveWindowWatcherXObserver,
- public InfoBarContainer::Delegate,
- public extensions::ExtensionKeybindingRegistry::Delegate {
+namespace user_prefs {
+class PrefRegistrySyncable;
+}
+
+// An implementation of BrowserWindow for GTK. Cross-platform code will interact
+// with this object when it needs to manipulate the window.
+class BrowserWindowGtk :
+ public BrowserWindow,
+ public content::NotificationObserver,
+ public TabStripModelObserver,
+ public ui::ActiveWindowWatcherXObserver,
+ public InfoBarContainer::Delegate,
+ public extensions::ExtensionKeybindingRegistry::Delegate {
public:
explicit BrowserWindowGtk(Browser* browser);
virtual ~BrowserWindowGtk();
@@ -248,7 +249,7 @@ class BrowserWindowGtk
// Returns the tab we're currently displaying in the tab contents container.
content::WebContents* GetDisplayedTab();
- static void RegisterUserPrefs(PrefRegistrySyncable* registry);
+ static void RegisterUserPrefs(user_prefs::PrefRegistrySyncable* registry);
// Tells GTK that the toolbar area is invalidated and needs redrawing. We
// have this method as a hack because GTK doesn't queue the toolbar area for
« no previous file with comments | « chrome/browser/ui/gesture_prefs_observer_factory_aura.cc ('k') | chrome/browser/ui/gtk/browser_window_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698