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

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

Issue 136003008: [Variations] Read the policy from profile prefs if on Android (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: DCHECK (bis) Created 6 years, 10 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 | « chrome/browser/metrics/variations/variations_service_unittest.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 381 matching lines...) Expand 10 before | Expand all | Expand 10 after
392 392
393 #if defined(ENABLE_MDNS) 393 #if defined(ENABLE_MDNS)
394 LocalDiscoveryUI::RegisterProfilePrefs(registry); 394 LocalDiscoveryUI::RegisterProfilePrefs(registry);
395 #endif 395 #endif
396 396
397 #if defined(ENABLE_NOTIFICATIONS) 397 #if defined(ENABLE_NOTIFICATIONS)
398 DesktopNotificationService::RegisterProfilePrefs(registry); 398 DesktopNotificationService::RegisterProfilePrefs(registry);
399 #endif 399 #endif
400 400
401 #if defined(OS_ANDROID) 401 #if defined(OS_ANDROID)
402 chrome_variations::VariationsService::RegisterProfilePrefs(registry);
402 NewTabPagePrefs::RegisterProfilePrefs(registry); 403 NewTabPagePrefs::RegisterProfilePrefs(registry);
403 PartnerBookmarksShim::RegisterProfilePrefs(registry); 404 PartnerBookmarksShim::RegisterProfilePrefs(registry);
404 PromoHandler::RegisterProfilePrefs(registry); 405 PromoHandler::RegisterProfilePrefs(registry);
405 #else 406 #else
406 AppShortcutManager::RegisterProfilePrefs(registry); 407 AppShortcutManager::RegisterProfilePrefs(registry);
407 autofill::GeneratedCreditCardBubbleController::RegisterUserPrefs(registry); 408 autofill::GeneratedCreditCardBubbleController::RegisterUserPrefs(registry);
408 DeviceIDFetcher::RegisterProfilePrefs(registry); 409 DeviceIDFetcher::RegisterProfilePrefs(registry);
409 DevToolsWindow::RegisterProfilePrefs(registry); 410 DevToolsWindow::RegisterProfilePrefs(registry);
410 extensions::CommandService::RegisterProfilePrefs(registry); 411 extensions::CommandService::RegisterProfilePrefs(registry);
411 extensions::ExtensionSettingsHandler::RegisterProfilePrefs(registry); 412 extensions::ExtensionSettingsHandler::RegisterProfilePrefs(registry);
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
569 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, 570 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
570 current_version); 571 current_version);
571 } 572 }
572 573
573 #if defined(OS_CHROMEOS) 574 #if defined(OS_CHROMEOS)
574 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); 575 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state);
575 #endif 576 #endif
576 } 577 }
577 578
578 } // namespace chrome 579 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/metrics/variations/variations_service_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698