chrome/browser/prefs/browser_prefs.cc - Issue 11953021: Don't show the apps page on the NTP if the app launcher is installed.

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 11953021: Don't show the apps page on the NTP if the app launcher is installed. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: move getShouldShowApps message to onLoad. Created 7 years, 11 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 594f853fb47c1ec8a8af2b419d41cff69cc9ff43..26472e47db57bd9eec167ca90875e893e7cebce5 100644

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

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

@@ -18,6 +18,7 @@

#include "chrome/browser/download/download_prefs.h"

#include "chrome/browser/extensions/api/commands/command_service.h"

#include "chrome/browser/extensions/api/tabs/tabs_api.h"

+#include "chrome/browser/extensions/app_launcher.h"

#include "chrome/browser/extensions/component_loader.h"

#include "chrome/browser/extensions/extension_prefs.h"

#include "chrome/browser/extensions/extension_web_ui.h"

@@ -152,6 +153,7 @@ void RegisterLocalState(PrefServiceSimple* local_state) {

// Please keep this list alphabetized.

browser_shutdown::RegisterPrefs(local_state);

chrome::RegisterScreenshotPrefs(local_state);

+ extensions::app_launcher::RegisterPrefs(local_state);

ExternalProtocolHandler::RegisterPrefs(local_state);

FlagsUI::RegisterPrefs(local_state);

geolocation::RegisterPrefs(local_state);