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

Unified Diff: chrome/browser/prefs/browser_prefs.cc

Issue 10692110: screenshot disabling policy (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fixed Android and Mac builds Created 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/policy/configuration_policy_handler_list.cc ('k') | chrome/browser/resources/feedback.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/prefs/browser_prefs.cc
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index e9d979df67d64bf341ed0f24d9cffd40b0903c3e..ad17066f7ac490355b04b026e1b52a40cca01e4b 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -16,6 +16,7 @@
#include "chrome/browser/debugger/devtools_window.h"
#include "chrome/browser/download/download_prefs.h"
#include "chrome/browser/extensions/api/commands/command_service.h"
+#include "chrome/browser/extensions/api/tabs/tabs.h"
#include "chrome/browser/extensions/apps_promo.h"
#include "chrome/browser/extensions/component_loader.h"
#include "chrome/browser/extensions/extension_prefs.h"
@@ -68,6 +69,7 @@
#include "chrome/browser/ui/webui/plugins_ui.h"
#include "chrome/browser/ui/webui/print_preview/sticky_settings.h"
#include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h"
+#include "chrome/browser/ui/window_snapshot/window_snapshot.h"
#include "chrome/browser/upgrade_detector.h"
#include "chrome/browser/web_resource/promo_resource_service.h"
#include "chrome/common/pref_names.h"
@@ -141,6 +143,7 @@ void RegisterLocalState(PrefService* local_state) {
SSLConfigServiceManager::RegisterPrefs(local_state);
chrome_variations::VariationsService::RegisterPrefs(local_state);
WebCacheManager::RegisterPrefs(local_state);
+ chrome::RegisterScreenshotPrefs(local_state);
#if defined(ENABLE_CONFIGURATION_POLICY)
policy::CloudPolicySubsystem::RegisterPrefs(local_state);
@@ -235,6 +238,7 @@ void RegisterUserPrefs(PrefService* user_prefs) {
#if !defined(OS_ANDROID)
AppsPromo::RegisterUserPrefs(user_prefs);
+ CaptureVisibleTabFunction::RegisterUserPrefs(user_prefs);
ChromeToMobileService::RegisterUserPrefs(user_prefs);
extensions::CommandService::RegisterUserPrefs(user_prefs);
extensions::ComponentLoader::RegisterUserPrefs(user_prefs);
« no previous file with comments | « chrome/browser/policy/configuration_policy_handler_list.cc ('k') | chrome/browser/resources/feedback.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698