chrome/browser/ui/gtk/browser_window_gtk.h - Issue 12079097: Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified 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:

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 5c2204bc3213f336d69e5864d5bb3cebd6732d01..4d9e0c3ebec899289b7462b39ec902330ccbd08c 100644

--- a/chrome/browser/ui/gtk/browser_window_gtk.h

+++ b/chrome/browser/ui/gtk/browser_window_gtk.h

@@ -40,7 +40,8 @@ class GlobalMenuBar;

class InfoBarContainerGtk;

class InstantPreviewControllerGtk;

class LocationBar;

-class PrefServiceSyncable;

+class PrefRegistrySyncable;

+class PrefService;

class StatusBubbleGtk;

class TabContentsContainerGtk;

class TabStripGtk;

@@ -247,7 +248,8 @@ class BrowserWindowGtk

// Returns the tab we're currently displaying in the tab contents container.

content::WebContents* GetDisplayedTab();

- static void RegisterUserPrefs(PrefServiceSyncable* prefs);

+ static void RegisterUserPrefs(PrefService* 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