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

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

Issue 6902107: Merge 82987, 83304 - make sure that OEM tab is shown even if first login is Guest (Closed) Base URL: svn://svn.chromium.org/chrome/branches/742/src/
Patch Set: Created 9 years, 8 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 (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/autofill/autofill_manager.h" 8 #include "chrome/browser/autofill/autofill_manager.h"
9 #include "chrome/browser/background_contents_service.h" 9 #include "chrome/browser/background_contents_service.h"
10 #include "chrome/browser/background_mode_manager.h" 10 #include "chrome/browser/background_mode_manager.h"
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 #include "chrome/browser/ui/views/browser_actions_container.h" 62 #include "chrome/browser/ui/views/browser_actions_container.h"
63 #include "chrome/browser/ui/views/frame/browser_view.h" 63 #include "chrome/browser/ui/views/frame/browser_view.h"
64 #endif 64 #endif
65 65
66 #if defined(TOOLKIT_GTK) 66 #if defined(TOOLKIT_GTK)
67 #include "chrome/browser/ui/gtk/browser_window_gtk.h" 67 #include "chrome/browser/ui/gtk/browser_window_gtk.h"
68 #endif 68 #endif
69 69
70 #if defined(OS_CHROMEOS) 70 #if defined(OS_CHROMEOS)
71 #include "chrome/browser/chromeos/audio_mixer_alsa.h" 71 #include "chrome/browser/chromeos/audio_mixer_alsa.h"
72 #include "chrome/browser/chromeos/login/apply_services_customization.h" 72 #include "chrome/browser/chromeos/customization_document.h"
73 #include "chrome/browser/chromeos/login/signed_settings_temp_storage.h" 73 #include "chrome/browser/chromeos/login/signed_settings_temp_storage.h"
74 #include "chrome/browser/chromeos/login/user_manager.h" 74 #include "chrome/browser/chromeos/login/user_manager.h"
75 #include "chrome/browser/chromeos/login/wizard_controller.h" 75 #include "chrome/browser/chromeos/login/wizard_controller.h"
76 #include "chrome/browser/chromeos/preferences.h" 76 #include "chrome/browser/chromeos/preferences.h"
77 #include "chrome/browser/chromeos/status/input_method_menu.h" 77 #include "chrome/browser/chromeos/status/input_method_menu.h"
78 #include "chrome/browser/chromeos/user_cros_settings_provider.h" 78 #include "chrome/browser/chromeos/user_cros_settings_provider.h"
79 #endif 79 #endif
80 80
81 namespace browser { 81 namespace browser {
82 82
(...skipping 23 matching lines...) Expand all
106 BackgroundPageTracker::RegisterPrefs(local_state); 106 BackgroundPageTracker::RegisterPrefs(local_state);
107 NotificationUIManager::RegisterPrefs(local_state); 107 NotificationUIManager::RegisterPrefs(local_state);
108 PrefProxyConfigService::RegisterPrefs(local_state); 108 PrefProxyConfigService::RegisterPrefs(local_state);
109 policy::CloudPolicySubsystem::RegisterPrefs(local_state); 109 policy::CloudPolicySubsystem::RegisterPrefs(local_state);
110 #if defined(OS_CHROMEOS) 110 #if defined(OS_CHROMEOS)
111 chromeos::AudioMixerAlsa::RegisterPrefs(local_state); 111 chromeos::AudioMixerAlsa::RegisterPrefs(local_state);
112 chromeos::UserManager::RegisterPrefs(local_state); 112 chromeos::UserManager::RegisterPrefs(local_state);
113 chromeos::UserCrosSettingsProvider::RegisterPrefs(local_state); 113 chromeos::UserCrosSettingsProvider::RegisterPrefs(local_state);
114 WizardController::RegisterPrefs(local_state); 114 WizardController::RegisterPrefs(local_state);
115 chromeos::InputMethodMenu::RegisterPrefs(local_state); 115 chromeos::InputMethodMenu::RegisterPrefs(local_state);
116 chromeos::ApplyServicesCustomization::RegisterPrefs(local_state); 116 chromeos::ServicesCustomizationDocument::RegisterPrefs(local_state);
117 chromeos::SignedSettingsTempStorage::RegisterPrefs(local_state); 117 chromeos::SignedSettingsTempStorage::RegisterPrefs(local_state);
118 #endif 118 #endif
119 } 119 }
120 120
121 void RegisterUserPrefs(PrefService* user_prefs) { 121 void RegisterUserPrefs(PrefService* user_prefs) {
122 // User prefs 122 // User prefs
123 AppsPromo::RegisterUserPrefs(user_prefs); 123 AppsPromo::RegisterUserPrefs(user_prefs);
124 AutofillManager::RegisterUserPrefs(user_prefs); 124 AutofillManager::RegisterUserPrefs(user_prefs);
125 SessionStartupPref::RegisterUserPrefs(user_prefs); 125 SessionStartupPref::RegisterUserPrefs(user_prefs);
126 Browser::RegisterUserPrefs(user_prefs); 126 Browser::RegisterUserPrefs(user_prefs);
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 user_prefs->Set(prefs::kBrowserWindowPlacement, *(pref->GetValue())); 188 user_prefs->Set(prefs::kBrowserWindowPlacement, *(pref->GetValue()));
189 } 189 }
190 local_state->ClearPref(prefs::kBrowserWindowPlacement); 190 local_state->ClearPref(prefs::kBrowserWindowPlacement);
191 191
192 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, 192 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
193 current_version | WINDOWS_PREFS); 193 current_version | WINDOWS_PREFS);
194 } 194 }
195 } 195 }
196 196
197 } // namespace browser 197 } // namespace browser
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_info_private_api_chromeos.cc ('k') | chrome/browser/ui/webui/chromeos/register_page_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698