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

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

Issue 10800011: [Mac] Changes to the behavior of Lion+ fullscreen and presentation mode. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: 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 unified diff | Download patch
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 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" 68 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h"
69 #include "chrome/browser/ui/webui/plugins_ui.h" 69 #include "chrome/browser/ui/webui/plugins_ui.h"
70 #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h" 70 #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h"
71 #include "chrome/browser/upgrade_detector.h" 71 #include "chrome/browser/upgrade_detector.h"
72 #include "chrome/browser/web_resource/promo_resource_service.h" 72 #include "chrome/browser/web_resource/promo_resource_service.h"
73 #include "chrome/common/pref_names.h" 73 #include "chrome/common/pref_names.h"
74 #include "content/public/browser/render_process_host.h" 74 #include "content/public/browser/render_process_host.h"
75 75
76 #if defined(OS_MACOSX) 76 #if defined(OS_MACOSX)
77 #include "chrome/browser/ui/cocoa/confirm_quit.h" 77 #include "chrome/browser/ui/cocoa/confirm_quit.h"
78 #include "chrome/browser/ui/cocoa/presentation_mode_prefs.h"
79 #include "chrome/browser/ui/startup/obsolete_os_prompt.h" 78 #include "chrome/browser/ui/startup/obsolete_os_prompt.h"
80 #endif 79 #endif
81 80
82 #if defined(TOOLKIT_VIEWS) 81 #if defined(TOOLKIT_VIEWS)
83 #include "chrome/browser/ui/browser_view_prefs.h" 82 #include "chrome/browser/ui/browser_view_prefs.h"
84 #include "chrome/browser/ui/tabs/tab_strip_layout_type_prefs.h" 83 #include "chrome/browser/ui/tabs/tab_strip_layout_type_prefs.h"
85 #endif 84 #endif
86 85
87 #if defined(TOOLKIT_GTK) 86 #if defined(TOOLKIT_GTK)
88 #include "chrome/browser/ui/gtk/browser_window_gtk.h" 87 #include "chrome/browser/ui/gtk/browser_window_gtk.h"
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
252 251
253 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) 252 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
254 default_apps::RegisterUserPrefs(user_prefs); 253 default_apps::RegisterUserPrefs(user_prefs);
255 #endif 254 #endif
256 255
257 #if defined(OS_CHROMEOS) 256 #if defined(OS_CHROMEOS)
258 chromeos::Preferences::RegisterUserPrefs(user_prefs); 257 chromeos::Preferences::RegisterUserPrefs(user_prefs);
259 chromeos::ProxyConfigServiceImpl::RegisterPrefs(user_prefs); 258 chromeos::ProxyConfigServiceImpl::RegisterPrefs(user_prefs);
260 #endif 259 #endif
261 260
262 #if defined(OS_MACOSX)
263 PresentationModePrefs::RegisterUserPrefs(user_prefs);
264 #endif
265
266 #if defined(OS_WIN) 261 #if defined(OS_WIN)
267 NetworkProfileBubble::RegisterPrefs(user_prefs); 262 NetworkProfileBubble::RegisterPrefs(user_prefs);
268 #endif 263 #endif
269 } 264 }
270 265
271 void MigrateBrowserPrefs(Profile* profile, PrefService* local_state) { 266 void MigrateBrowserPrefs(Profile* profile, PrefService* local_state) {
272 // Copy pref values which have been migrated to user_prefs from local_state, 267 // Copy pref values which have been migrated to user_prefs from local_state,
273 // or remove them from local_state outright, if copying is not required. 268 // or remove them from local_state outright, if copying is not required.
274 int current_version = 269 int current_version =
275 local_state->GetInteger(prefs::kMultipleProfilePrefMigration); 270 local_state->GetInteger(prefs::kMultipleProfilePrefMigration);
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
329 } 324 }
330 local_state->ClearPref(prefs::kLastPromptedGoogleURL); 325 local_state->ClearPref(prefs::kLastPromptedGoogleURL);
331 326
332 current_version |= GOOGLE_URL_TRACKER_PREFS; 327 current_version |= GOOGLE_URL_TRACKER_PREFS;
333 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, 328 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
334 current_version); 329 current_version);
335 } 330 }
336 } 331 }
337 332
338 } // namespace chrome 333 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698