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

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

Issue 406483004: Initial implementation of API WakeLock. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 5 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
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 <string> 7 #include <string>
8 8
9 #include "base/debug/trace_event.h" 9 #include "base/debug/trace_event.h"
10 #include "base/prefs/pref_registry_simple.h" 10 #include "base/prefs/pref_registry_simple.h"
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 #include "chrome/browser/ui/startup/autolaunch_prompt.h" 74 #include "chrome/browser/ui/startup/autolaunch_prompt.h"
75 #include "chrome/browser/ui/startup/default_browser_prompt.h" 75 #include "chrome/browser/ui/startup/default_browser_prompt.h"
76 #include "chrome/browser/ui/tabs/pinned_tab_codec.h" 76 #include "chrome/browser/ui/tabs/pinned_tab_codec.h"
77 #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h" 77 #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h"
78 #include "chrome/browser/ui/webui/flags_ui.h" 78 #include "chrome/browser/ui/webui/flags_ui.h"
79 #include "chrome/browser/ui/webui/instant_ui.h" 79 #include "chrome/browser/ui/webui/instant_ui.h"
80 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" 80 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h"
81 #include "chrome/browser/ui/webui/plugins_ui.h" 81 #include "chrome/browser/ui/webui/plugins_ui.h"
82 #include "chrome/browser/ui/webui/print_preview/sticky_settings.h" 82 #include "chrome/browser/ui/webui/print_preview/sticky_settings.h"
83 #include "chrome/browser/upgrade_detector.h" 83 #include "chrome/browser/upgrade_detector.h"
84 #include "chrome/browser/wake_lock/wake_lock_preference.h"
84 #include "chrome/browser/web_resource/promo_resource_service.h" 85 #include "chrome/browser/web_resource/promo_resource_service.h"
85 #include "chrome/common/pref_names.h" 86 #include "chrome/common/pref_names.h"
86 #include "components/autofill/core/browser/autofill_manager.h" 87 #include "components/autofill/core/browser/autofill_manager.h"
87 #include "components/bookmarks/browser/bookmark_utils.h" 88 #include "components/bookmarks/browser/bookmark_utils.h"
88 #include "components/dom_distiller/core/distilled_page_prefs.h" 89 #include "components/dom_distiller/core/distilled_page_prefs.h"
89 #include "components/google/core/browser/google_pref_names.h" 90 #include "components/google/core/browser/google_pref_names.h"
90 #include "components/google/core/browser/google_url_tracker.h" 91 #include "components/google/core/browser/google_url_tracker.h"
91 #include "components/network_time/network_time_tracker.h" 92 #include "components/network_time/network_time_tracker.h"
92 #include "components/password_manager/core/browser/password_manager.h" 93 #include "components/password_manager/core/browser/password_manager.h"
93 #include "components/pref_registry/pref_registry_syncable.h" 94 #include "components/pref_registry/pref_registry_syncable.h"
(...skipping 387 matching lines...) Expand 10 before | Expand all | Expand 10 after
481 registry->RegisterDictionaryPref( 482 registry->RegisterDictionaryPref(
482 kBackupPref, 483 kBackupPref,
483 new base::DictionaryValue(), 484 new base::DictionaryValue(),
484 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 485 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
485 #if !defined(OS_ANDROID) 486 #if !defined(OS_ANDROID)
486 registry->RegisterStringPref( 487 registry->RegisterStringPref(
487 kSyncPromoErrorMessage, 488 kSyncPromoErrorMessage,
488 std::string(), 489 std::string(),
489 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 490 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
490 #endif 491 #endif
492 WakeLockPreference::RegisterProfilePrefs(registry);
491 } 493 }
492 494
493 void RegisterUserProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { 495 void RegisterUserProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
494 RegisterProfilePrefs(registry); 496 RegisterProfilePrefs(registry);
495 497
496 #if defined(OS_CHROMEOS) 498 #if defined(OS_CHROMEOS)
497 chromeos::PowerPrefs::RegisterUserProfilePrefs(registry); 499 chromeos::PowerPrefs::RegisterUserProfilePrefs(registry);
498 #endif 500 #endif
499 } 501 }
500 502
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
593 #if defined(OS_CHROMEOS) 595 #if defined(OS_CHROMEOS)
594 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); 596 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state);
595 #endif 597 #endif
596 598
597 #if defined(TOOLKIT_VIEWS) 599 #if defined(TOOLKIT_VIEWS)
598 MigrateBrowserTabStripPrefs(local_state); 600 MigrateBrowserTabStripPrefs(local_state);
599 #endif 601 #endif
600 } 602 }
601 603
602 } // namespace chrome 604 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698