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

Side by Side 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:
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 #include "chrome/browser/prefs/browser_prefs.h" 5 #include "chrome/browser/prefs/browser_prefs.h"
6 6
7 #include "chrome/browser/about_flags.h" 7 #include "chrome/browser/about_flags.h"
8 #include "chrome/browser/accessibility/invert_bubble_prefs.h" 8 #include "chrome/browser/accessibility/invert_bubble_prefs.h"
9 #include "chrome/browser/autofill/autofill_manager.h" 9 #include "chrome/browser/autofill/autofill_manager.h"
10 #include "chrome/browser/background/background_mode_manager.h" 10 #include "chrome/browser/background/background_mode_manager.h"
11 #include "chrome/browser/bookmarks/bookmark_prompt_prefs.h" 11 #include "chrome/browser/bookmarks/bookmark_prompt_prefs.h"
12 #include "chrome/browser/bookmarks/bookmark_utils.h" 12 #include "chrome/browser/bookmarks/bookmark_utils.h"
13 #include "chrome/browser/browser_shutdown.h" 13 #include "chrome/browser/browser_shutdown.h"
14 #include "chrome/browser/chrome_content_browser_client.h" 14 #include "chrome/browser/chrome_content_browser_client.h"
15 #include "chrome/browser/content_settings/host_content_settings_map.h" 15 #include "chrome/browser/content_settings/host_content_settings_map.h"
16 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" 16 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
17 #include "chrome/browser/devtools/devtools_window.h" 17 #include "chrome/browser/devtools/devtools_window.h"
18 #include "chrome/browser/download/download_prefs.h" 18 #include "chrome/browser/download/download_prefs.h"
19 #include "chrome/browser/extensions/api/commands/command_service.h" 19 #include "chrome/browser/extensions/api/commands/command_service.h"
20 #include "chrome/browser/extensions/api/tabs/tabs_api.h" 20 #include "chrome/browser/extensions/api/tabs/tabs_api.h"
21 #include "chrome/browser/extensions/app_launcher.h"
21 #include "chrome/browser/extensions/component_loader.h" 22 #include "chrome/browser/extensions/component_loader.h"
22 #include "chrome/browser/extensions/extension_prefs.h" 23 #include "chrome/browser/extensions/extension_prefs.h"
23 #include "chrome/browser/extensions/extension_web_ui.h" 24 #include "chrome/browser/extensions/extension_web_ui.h"
24 #include "chrome/browser/external_protocol/external_protocol_handler.h" 25 #include "chrome/browser/external_protocol/external_protocol_handler.h"
25 #include "chrome/browser/first_run/first_run.h" 26 #include "chrome/browser/first_run/first_run.h"
26 #include "chrome/browser/geolocation/geolocation_prefs.h" 27 #include "chrome/browser/geolocation/geolocation_prefs.h"
27 #include "chrome/browser/google/google_url_tracker.h" 28 #include "chrome/browser/google/google_url_tracker.h"
28 #include "chrome/browser/google/google_url_tracker_factory.h" 29 #include "chrome/browser/google/google_url_tracker_factory.h"
29 #include "chrome/browser/intents/web_intents_util.h" 30 #include "chrome/browser/intents/web_intents_util.h"
30 #include "chrome/browser/intranet_redirect_detector.h" 31 #include "chrome/browser/intranet_redirect_detector.h"
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 146
146 namespace chrome { 147 namespace chrome {
147 148
148 void RegisterLocalState(PrefServiceSimple* local_state) { 149 void RegisterLocalState(PrefServiceSimple* local_state) {
149 // Prefs in Local State. 150 // Prefs in Local State.
150 local_state->RegisterIntegerPref(prefs::kMultipleProfilePrefMigration, 0); 151 local_state->RegisterIntegerPref(prefs::kMultipleProfilePrefMigration, 0);
151 152
152 // Please keep this list alphabetized. 153 // Please keep this list alphabetized.
153 browser_shutdown::RegisterPrefs(local_state); 154 browser_shutdown::RegisterPrefs(local_state);
154 chrome::RegisterScreenshotPrefs(local_state); 155 chrome::RegisterScreenshotPrefs(local_state);
156 extensions::app_launcher::RegisterPrefs(local_state);
155 ExternalProtocolHandler::RegisterPrefs(local_state); 157 ExternalProtocolHandler::RegisterPrefs(local_state);
156 FlagsUI::RegisterPrefs(local_state); 158 FlagsUI::RegisterPrefs(local_state);
157 geolocation::RegisterPrefs(local_state); 159 geolocation::RegisterPrefs(local_state);
158 IntranetRedirectDetector::RegisterPrefs(local_state); 160 IntranetRedirectDetector::RegisterPrefs(local_state);
159 KeywordEditorController::RegisterPrefs(local_state); 161 KeywordEditorController::RegisterPrefs(local_state);
160 MetricsLog::RegisterPrefs(local_state); 162 MetricsLog::RegisterPrefs(local_state);
161 MetricsService::RegisterPrefs(local_state); 163 MetricsService::RegisterPrefs(local_state);
162 PrefProxyConfigTrackerImpl::RegisterPrefs(local_state); 164 PrefProxyConfigTrackerImpl::RegisterPrefs(local_state);
163 ProfileInfoCache::RegisterPrefs(local_state); 165 ProfileInfoCache::RegisterPrefs(local_state);
164 ProfileManager::RegisterPrefs(local_state); 166 ProfileManager::RegisterPrefs(local_state);
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
384 } 386 }
385 local_state->ClearPref(prefs::kLastPromptedGoogleURL); 387 local_state->ClearPref(prefs::kLastPromptedGoogleURL);
386 388
387 current_version |= GOOGLE_URL_TRACKER_PREFS; 389 current_version |= GOOGLE_URL_TRACKER_PREFS;
388 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, 390 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
389 current_version); 391 current_version);
390 } 392 }
391 } 393 }
392 394
393 } // namespace chrome 395 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_install_ui_default.cc ('k') | chrome/browser/resources/ntp4/new_tab.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698