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

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

Issue 10824112: Move Chrome OS device settings stuff to chrome/browser/chromeos/settings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase. Created 8 years, 4 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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"
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 #include "chrome/browser/ui/tabs/tab_strip_layout_type_prefs.h" 85 #include "chrome/browser/ui/tabs/tab_strip_layout_type_prefs.h"
86 #endif 86 #endif
87 87
88 #if defined(TOOLKIT_GTK) 88 #if defined(TOOLKIT_GTK)
89 #include "chrome/browser/ui/gtk/browser_window_gtk.h" 89 #include "chrome/browser/ui/gtk/browser_window_gtk.h"
90 #endif 90 #endif
91 91
92 #if defined(OS_CHROMEOS) 92 #if defined(OS_CHROMEOS)
93 #include "chrome/browser/chromeos/audio/audio_handler.h" 93 #include "chrome/browser/chromeos/audio/audio_handler.h"
94 #include "chrome/browser/chromeos/customization_document.h" 94 #include "chrome/browser/chromeos/customization_document.h"
95 #include "chrome/browser/chromeos/login/signed_settings_cache.h"
96 #include "chrome/browser/chromeos/login/user_manager.h" 95 #include "chrome/browser/chromeos/login/user_manager.h"
97 #include "chrome/browser/chromeos/login/wallpaper_manager.h" 96 #include "chrome/browser/chromeos/login/wallpaper_manager.h"
98 #include "chrome/browser/chromeos/login/wizard_controller.h" 97 #include "chrome/browser/chromeos/login/wizard_controller.h"
99 #include "chrome/browser/chromeos/preferences.h" 98 #include "chrome/browser/chromeos/preferences.h"
100 #include "chrome/browser/chromeos/proxy_config_service_impl.h" 99 #include "chrome/browser/chromeos/proxy_config_service_impl.h"
100 #include "chrome/browser/chromeos/settings/signed_settings_cache.h"
101 #include "chrome/browser/chromeos/status/data_promo_notification.h" 101 #include "chrome/browser/chromeos/status/data_promo_notification.h"
102 #include "chrome/browser/policy/auto_enrollment_client.h" 102 #include "chrome/browser/policy/auto_enrollment_client.h"
103 #include "chrome/browser/policy/device_status_collector.h" 103 #include "chrome/browser/policy/device_status_collector.h"
104 #else 104 #else
105 #include "chrome/browser/extensions/default_apps.h" 105 #include "chrome/browser/extensions/default_apps.h"
106 #endif 106 #endif
107 107
108 #if defined(USE_ASH) 108 #if defined(USE_ASH)
109 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h" 109 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h"
110 #endif 110 #endif
(...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
332 } 332 }
333 local_state->ClearPref(prefs::kLastPromptedGoogleURL); 333 local_state->ClearPref(prefs::kLastPromptedGoogleURL);
334 334
335 current_version |= GOOGLE_URL_TRACKER_PREFS; 335 current_version |= GOOGLE_URL_TRACKER_PREFS;
336 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, 336 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
337 current_version); 337 current_version);
338 } 338 }
339 } 339 }
340 340
341 } // namespace chrome 341 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/policy/device_status_collector_unittest.cc ('k') | chrome/browser/profiles/profile_io_data.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698