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

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

Issue 1970613003: Add a new app API to enable watchdog behavior restarts in kiosk apps (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase + Devlin's comments Created 4 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:
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/metrics/histogram_macros.h" 9 #include "base/metrics/histogram_macros.h"
10 #include "base/trace_event/trace_event.h" 10 #include "base/trace_event/trace_event.h"
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 #include "chrome/browser/extensions/activity_log/activity_log.h" 109 #include "chrome/browser/extensions/activity_log/activity_log.h"
110 #include "chrome/browser/extensions/api/commands/command_service.h" 110 #include "chrome/browser/extensions/api/commands/command_service.h"
111 #include "chrome/browser/extensions/api/copresence/copresence_api.h" 111 #include "chrome/browser/extensions/api/copresence/copresence_api.h"
112 #include "chrome/browser/extensions/api/tabs/tabs_api.h" 112 #include "chrome/browser/extensions/api/tabs/tabs_api.h"
113 #include "chrome/browser/extensions/component_migration_helper.h" 113 #include "chrome/browser/extensions/component_migration_helper.h"
114 #include "chrome/browser/extensions/extension_web_ui.h" 114 #include "chrome/browser/extensions/extension_web_ui.h"
115 #include "chrome/browser/extensions/launch_util.h" 115 #include "chrome/browser/extensions/launch_util.h"
116 #include "chrome/browser/signin/easy_unlock_service.h" 116 #include "chrome/browser/signin/easy_unlock_service.h"
117 #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h" 117 #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h"
118 #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h" 118 #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h"
119 #include "extensions/browser/api/runtime/runtime_api.h"
119 #include "extensions/browser/extension_prefs.h" 120 #include "extensions/browser/extension_prefs.h"
120 #endif // defined(ENABLE_EXTENSIONS) 121 #endif // defined(ENABLE_EXTENSIONS)
121 122
122 #if defined(ENABLE_PLUGIN_INSTALLATION) 123 #if defined(ENABLE_PLUGIN_INSTALLATION)
123 #include "chrome/browser/plugins/plugins_resource_service.h" 124 #include "chrome/browser/plugins/plugins_resource_service.h"
124 #endif 125 #endif
125 126
126 #if defined(ENABLE_SUPERVISED_USERS) 127 #if defined(ENABLE_SUPERVISED_USERS)
127 #include "chrome/browser/supervised_user/child_accounts/child_account_service.h" 128 #include "chrome/browser/supervised_user/child_accounts/child_account_service.h"
128 #include "chrome/browser/supervised_user/legacy/supervised_user_shared_settings_ service.h" 129 #include "chrome/browser/supervised_user/legacy/supervised_user_shared_settings_ service.h"
(...skipping 326 matching lines...) Expand 10 before | Expand all | Expand 10 after
455 #if defined(ENABLE_EXTENSIONS) 456 #if defined(ENABLE_EXTENSIONS)
456 EasyUnlockService::RegisterProfilePrefs(registry); 457 EasyUnlockService::RegisterProfilePrefs(registry);
457 ExtensionWebUI::RegisterProfilePrefs(registry); 458 ExtensionWebUI::RegisterProfilePrefs(registry);
458 RegisterAnimationPolicyPrefs(registry); 459 RegisterAnimationPolicyPrefs(registry);
459 ToolbarActionsBar::RegisterProfilePrefs(registry); 460 ToolbarActionsBar::RegisterProfilePrefs(registry);
460 extensions::ActivityLog::RegisterProfilePrefs(registry); 461 extensions::ActivityLog::RegisterProfilePrefs(registry);
461 extensions::ComponentMigrationHelper::RegisterPrefs(registry); 462 extensions::ComponentMigrationHelper::RegisterPrefs(registry);
462 extensions::CopresenceService::RegisterProfilePrefs(registry); 463 extensions::CopresenceService::RegisterProfilePrefs(registry);
463 extensions::ExtensionPrefs::RegisterProfilePrefs(registry); 464 extensions::ExtensionPrefs::RegisterProfilePrefs(registry);
464 extensions::launch_util::RegisterProfilePrefs(registry); 465 extensions::launch_util::RegisterProfilePrefs(registry);
466 extensions::RuntimeAPI::RegisterPrefs(registry);
465 #endif // defined(ENABLE_EXTENSIONS) 467 #endif // defined(ENABLE_EXTENSIONS)
466 468
467 #if defined(ENABLE_NOTIFICATIONS) 469 #if defined(ENABLE_NOTIFICATIONS)
468 NotifierStateTracker::RegisterProfilePrefs(registry); 470 NotifierStateTracker::RegisterProfilePrefs(registry);
469 #endif 471 #endif
470 472
471 #if defined(ENABLE_NOTIFICATIONS) && defined(ENABLE_EXTENSIONS) && \ 473 #if defined(ENABLE_NOTIFICATIONS) && defined(ENABLE_EXTENSIONS) && \
472 !defined(OS_ANDROID) 474 !defined(OS_ANDROID)
473 // The extension welcome notification requires a build that enables extensions 475 // The extension welcome notification requires a build that enables extensions
474 // and notifications, and uses the UI message center. 476 // and notifications, and uses the UI message center.
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
683 metrics_service 685 metrics_service
684 ? base::Time::FromTimeT(metrics_service->GetInstallDate()) 686 ? base::Time::FromTimeT(metrics_service->GetInstallDate())
685 : base::Time::Now(); 687 : base::Time::Now();
686 profile_prefs->SetInt64(prefs::kDefaultBrowserLastDeclined, 688 profile_prefs->SetInt64(prefs::kDefaultBrowserLastDeclined,
687 install_time.ToInternalValue()); 689 install_time.ToInternalValue());
688 } 690 }
689 profile_prefs->ClearPref(kCheckDefaultBrowser); 691 profile_prefs->ClearPref(kCheckDefaultBrowser);
690 } 692 }
691 693
692 } // namespace chrome 694 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698