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

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

Issue 11747025: Run the JSON Schema Compiler's bundle compilation on JSON files. Previously it (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: restore fileBrowserPrivate bindings 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.h" 20 #include "chrome/browser/extensions/api/tabs/tabs_api.h"
21 #include "chrome/browser/extensions/component_loader.h" 21 #include "chrome/browser/extensions/component_loader.h"
22 #include "chrome/browser/extensions/extension_prefs.h" 22 #include "chrome/browser/extensions/extension_prefs.h"
23 #include "chrome/browser/extensions/extension_web_ui.h" 23 #include "chrome/browser/extensions/extension_web_ui.h"
24 #include "chrome/browser/external_protocol/external_protocol_handler.h" 24 #include "chrome/browser/external_protocol/external_protocol_handler.h"
25 #include "chrome/browser/first_run/first_run.h" 25 #include "chrome/browser/first_run/first_run.h"
26 #include "chrome/browser/geolocation/geolocation_prefs.h" 26 #include "chrome/browser/geolocation/geolocation_prefs.h"
27 #include "chrome/browser/google/google_url_tracker.h" 27 #include "chrome/browser/google/google_url_tracker.h"
28 #include "chrome/browser/google/google_url_tracker_factory.h" 28 #include "chrome/browser/google/google_url_tracker_factory.h"
29 #include "chrome/browser/intents/web_intents_util.h" 29 #include "chrome/browser/intents/web_intents_util.h"
30 #include "chrome/browser/intranet_redirect_detector.h" 30 #include "chrome/browser/intranet_redirect_detector.h"
(...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after
272 #if defined(OS_ANDROID) 272 #if defined(OS_ANDROID)
273 geolocation::RegisterUserPrefs(user_prefs); 273 geolocation::RegisterUserPrefs(user_prefs);
274 PromoHandler::RegisterUserPrefs(user_prefs); 274 PromoHandler::RegisterUserPrefs(user_prefs);
275 #endif 275 #endif
276 276
277 #if defined(USE_ASH) 277 #if defined(USE_ASH)
278 ash::RegisterChromeLauncherUserPrefs(user_prefs); 278 ash::RegisterChromeLauncherUserPrefs(user_prefs);
279 #endif 279 #endif
280 280
281 #if !defined(OS_ANDROID) 281 #if !defined(OS_ANDROID)
282 CaptureVisibleTabFunction::RegisterUserPrefs(user_prefs); 282 TabsCaptureVisibleTabFunction::RegisterUserPrefs(user_prefs);
283 ChromeToMobileService::RegisterUserPrefs(user_prefs); 283 ChromeToMobileService::RegisterUserPrefs(user_prefs);
284 DevToolsWindow::RegisterUserPrefs(user_prefs); 284 DevToolsWindow::RegisterUserPrefs(user_prefs);
285 extensions::CommandService::RegisterUserPrefs(user_prefs); 285 extensions::CommandService::RegisterUserPrefs(user_prefs);
286 ExtensionSettingsHandler::RegisterUserPrefs(user_prefs); 286 ExtensionSettingsHandler::RegisterUserPrefs(user_prefs);
287 ManagedMode::RegisterUserPrefs(user_prefs); 287 ManagedMode::RegisterUserPrefs(user_prefs);
288 PepperFlashSettingsManager::RegisterUserPrefs(user_prefs); 288 PepperFlashSettingsManager::RegisterUserPrefs(user_prefs);
289 PinnedTabCodec::RegisterUserPrefs(user_prefs); 289 PinnedTabCodec::RegisterUserPrefs(user_prefs);
290 PluginsUI::RegisterUserPrefs(user_prefs); 290 PluginsUI::RegisterUserPrefs(user_prefs);
291 printing::StickySettings::RegisterUserPrefs(user_prefs); 291 printing::StickySettings::RegisterUserPrefs(user_prefs);
292 RegisterAutolaunchUserPrefs(user_prefs); 292 RegisterAutolaunchUserPrefs(user_prefs);
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
379 } 379 }
380 local_state->ClearPref(prefs::kLastPromptedGoogleURL); 380 local_state->ClearPref(prefs::kLastPromptedGoogleURL);
381 381
382 current_version |= GOOGLE_URL_TRACKER_PREFS; 382 current_version |= GOOGLE_URL_TRACKER_PREFS;
383 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, 383 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
384 current_version); 384 current_version);
385 } 385 }
386 } 386 }
387 387
388 } // namespace chrome 388 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698