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

Side by Side Diff: chrome/browser/ui/gtk/browser_window_gtk.h

Issue 12079097: Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to head again; base::File changes conflicted. Created 7 years, 10 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_UI_GTK_BROWSER_WINDOW_GTK_H_ 5 #ifndef CHROME_BROWSER_UI_GTK_BROWSER_WINDOW_GTK_H_
6 #define CHROME_BROWSER_UI_GTK_BROWSER_WINDOW_GTK_H_ 6 #define CHROME_BROWSER_UI_GTK_BROWSER_WINDOW_GTK_H_
7 7
8 #include <gtk/gtk.h> 8 #include <gtk/gtk.h>
9 9
10 #include <string> 10 #include <string>
(...skipping 22 matching lines...) Expand all
33 class BrowserToolbarGtk; 33 class BrowserToolbarGtk;
34 class DevToolsWindow; 34 class DevToolsWindow;
35 class DownloadShelfGtk; 35 class DownloadShelfGtk;
36 class ExtensionKeybindingRegistryGtk; 36 class ExtensionKeybindingRegistryGtk;
37 class FindBarGtk; 37 class FindBarGtk;
38 class FullscreenExitBubbleGtk; 38 class FullscreenExitBubbleGtk;
39 class GlobalMenuBar; 39 class GlobalMenuBar;
40 class InfoBarContainerGtk; 40 class InfoBarContainerGtk;
41 class InstantPreviewControllerGtk; 41 class InstantPreviewControllerGtk;
42 class LocationBar; 42 class LocationBar;
43 class PrefServiceSyncable; 43 class PrefRegistrySyncable;
44 class PrefService;
44 class StatusBubbleGtk; 45 class StatusBubbleGtk;
45 class TabContentsContainerGtk; 46 class TabContentsContainerGtk;
46 class TabStripGtk; 47 class TabStripGtk;
47 48
48 namespace autofill { 49 namespace autofill {
49 class PasswordGenerator; 50 class PasswordGenerator;
50 } 51 }
51 52
52 namespace extensions { 53 namespace extensions {
53 class ActiveTabPermissionGranter; 54 class ActiveTabPermissionGranter;
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
240 241
241 GtkWidget* titlebar_widget() const; 242 GtkWidget* titlebar_widget() const;
242 243
243 BrowserToolbarGtk* GetToolbar() { return toolbar_.get(); } 244 BrowserToolbarGtk* GetToolbar() { return toolbar_.get(); }
244 245
245 gfx::Rect bounds() const { return bounds_; } 246 gfx::Rect bounds() const { return bounds_; }
246 247
247 // Returns the tab we're currently displaying in the tab contents container. 248 // Returns the tab we're currently displaying in the tab contents container.
248 content::WebContents* GetDisplayedTab(); 249 content::WebContents* GetDisplayedTab();
249 250
250 static void RegisterUserPrefs(PrefServiceSyncable* prefs); 251 static void RegisterUserPrefs(PrefService* prefs,
252 PrefRegistrySyncable* registry);
251 253
252 // Tells GTK that the toolbar area is invalidated and needs redrawing. We 254 // Tells GTK that the toolbar area is invalidated and needs redrawing. We
253 // have this method as a hack because GTK doesn't queue the toolbar area for 255 // have this method as a hack because GTK doesn't queue the toolbar area for
254 // redraw when it should. 256 // redraw when it should.
255 void QueueToolbarRedraw(); 257 void QueueToolbarRedraw();
256 258
257 // Get the position where the infobar arrow should be anchored in 259 // Get the position where the infobar arrow should be anchored in
258 // |relative_to| coordinates. This is the middle of the omnibox location icon. 260 // |relative_to| coordinates. This is the middle of the omnibox location icon.
259 int GetXPositionOfLocationIcon(GtkWidget* relative_to); 261 int GetXPositionOfLocationIcon(GtkWidget* relative_to);
260 262
(...skipping 308 matching lines...) Expand 10 before | Expand all | Expand 10 after
569 scoped_ptr<FullscreenExitBubbleGtk> fullscreen_exit_bubble_; 571 scoped_ptr<FullscreenExitBubbleGtk> fullscreen_exit_bubble_;
570 572
571 FullscreenExitBubbleType fullscreen_exit_bubble_type_; 573 FullscreenExitBubbleType fullscreen_exit_bubble_type_;
572 574
573 content::NotificationRegistrar registrar_; 575 content::NotificationRegistrar registrar_;
574 576
575 DISALLOW_COPY_AND_ASSIGN(BrowserWindowGtk); 577 DISALLOW_COPY_AND_ASSIGN(BrowserWindowGtk);
576 }; 578 };
577 579
578 #endif // CHROME_BROWSER_UI_GTK_BROWSER_WINDOW_GTK_H_ 580 #endif // CHROME_BROWSER_UI_GTK_BROWSER_WINDOW_GTK_H_
OLDNEW
« 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