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

Side by Side Diff: chrome/browser/prefs/browser_prefs.cc

Issue 17261016: When app shortcuts are enabled, do a once-off creation of all shortcuts. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address comments. Fix tests. Created 7 years, 6 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
« no previous file with comments | « apps/shortcut_manager.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "apps/prefs.h" 7 #include "apps/prefs.h"
8 #include "base/debug/trace_event.h" 8 #include "base/debug/trace_event.h"
9 #include "base/prefs/pref_registry_simple.h" 9 #include "base/prefs/pref_registry_simple.h"
10 #include "base/prefs/pref_service.h" 10 #include "base/prefs/pref_service.h"
(...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after
277 277
278 #if defined(OS_MACOSX) 278 #if defined(OS_MACOSX)
279 confirm_quit::RegisterLocalState(registry); 279 confirm_quit::RegisterLocalState(registry);
280 #endif 280 #endif
281 } 281 }
282 282
283 void RegisterUserPrefs(user_prefs::PrefRegistrySyncable* registry) { 283 void RegisterUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
284 TRACE_EVENT0("browser", "chrome::RegisterUserPrefs"); 284 TRACE_EVENT0("browser", "chrome::RegisterUserPrefs");
285 // User prefs. Please keep this list alphabetized. 285 // User prefs. Please keep this list alphabetized.
286 AlternateErrorPageTabObserver::RegisterUserPrefs(registry); 286 AlternateErrorPageTabObserver::RegisterUserPrefs(registry);
287 apps::RegisterUserPrefs(registry);
287 autofill::AutofillDialogControllerImpl::RegisterUserPrefs(registry); 288 autofill::AutofillDialogControllerImpl::RegisterUserPrefs(registry);
288 autofill::AutofillManager::RegisterUserPrefs(registry); 289 autofill::AutofillManager::RegisterUserPrefs(registry);
289 BookmarkPromptPrefs::RegisterUserPrefs(registry); 290 BookmarkPromptPrefs::RegisterUserPrefs(registry);
290 bookmark_utils::RegisterUserPrefs(registry); 291 bookmark_utils::RegisterUserPrefs(registry);
291 browser_sync::SyncPrefs::RegisterUserPrefs(registry); 292 browser_sync::SyncPrefs::RegisterUserPrefs(registry);
292 chrome::RegisterInstantUserPrefs(registry); 293 chrome::RegisterInstantUserPrefs(registry);
293 ChromeContentBrowserClient::RegisterUserPrefs(registry); 294 ChromeContentBrowserClient::RegisterUserPrefs(registry);
294 ChromeVersionService::RegisterUserPrefs(registry); 295 ChromeVersionService::RegisterUserPrefs(registry);
295 chrome_browser_net::HttpServerPropertiesManager::RegisterUserPrefs( 296 chrome_browser_net::HttpServerPropertiesManager::RegisterUserPrefs(
296 registry); 297 registry);
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
465 } 466 }
466 local_state->ClearPref(prefs::kLastPromptedGoogleURL); 467 local_state->ClearPref(prefs::kLastPromptedGoogleURL);
467 468
468 current_version |= GOOGLE_URL_TRACKER_PREFS; 469 current_version |= GOOGLE_URL_TRACKER_PREFS;
469 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, 470 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
470 current_version); 471 current_version);
471 } 472 }
472 } 473 }
473 474
474 } // namespace chrome 475 } // namespace chrome
OLDNEW
« no previous file with comments | « apps/shortcut_manager.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698