chrome/browser/prefs/browser_prefs.cc - Issue 2857103007: [Night Light] CL2: Ash and system tray work

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/prefs/browser_prefs.cc

Issue 2857103007: [Night Light] CL2: Ash and system tray work (Closed)

Patch Set: Update comment Created 3 years, 7 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/prefs/browser_prefs.cc

diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc

index d101a40a92f2a8abea33882a3242cd89a2bc3074..500f488c97d5a4a39074b41cf565a88752dfc948 100644

--- a/chrome/browser/prefs/browser_prefs.cc

+++ b/chrome/browser/prefs/browser_prefs.cc

@@ -261,6 +261,7 @@

#endif

#if defined(USE_ASH)

+#include "ash/shell.h"

#include "chrome/browser/ui/ash/chrome_launcher_prefs.h"

#endif

@@ -644,6 +645,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {

#if defined(USE_ASH)

RegisterChromeLauncherUserPrefs(registry);

+ ash::Shell::RegisterPrefs(registry);

#endif

#if !defined(OS_ANDROID) && !defined(OS_IOS)

« no previous file with comments | « ash/system/tray/system_tray_item.h ('k') | tools/metrics/actions/actions.xml » ('j') | no next file with comments »