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

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

Issue 146363002: Linux Aura: Use system title bar is now set by preference, not flag. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rename BrowserView pref registration functions. 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/about_flags.cc ('k') | chrome/browser/resources/options/browser_options.html » ('j') | 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 304 matching lines...) Expand 10 before | Expand all | Expand 10 after
315 #if defined(OS_MACOSX) 315 #if defined(OS_MACOSX)
316 confirm_quit::RegisterLocalState(registry); 316 confirm_quit::RegisterLocalState(registry);
317 #endif 317 #endif
318 318
319 #if defined(OS_WIN) 319 #if defined(OS_WIN)
320 app_metro_launch::RegisterPrefs(registry); 320 app_metro_launch::RegisterPrefs(registry);
321 PasswordManager::RegisterLocalPrefs(registry); 321 PasswordManager::RegisterLocalPrefs(registry);
322 #endif 322 #endif
323 323
324 #if defined(TOOLKIT_VIEWS) 324 #if defined(TOOLKIT_VIEWS)
325 RegisterBrowserViewPrefs(registry); 325 RegisterBrowserViewLocalPrefs(registry);
326 RegisterTabStripLayoutTypePrefs(registry); 326 RegisterTabStripLayoutTypePrefs(registry);
327 #endif 327 #endif
328 } 328 }
329 329
330 // Register prefs applicable to all profiles. 330 // Register prefs applicable to all profiles.
331 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { 331 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
332 TRACE_EVENT0("browser", "chrome::RegisterUserPrefs"); 332 TRACE_EVENT0("browser", "chrome::RegisterUserPrefs");
333 // User prefs. Please keep this list alphabetized. 333 // User prefs. Please keep this list alphabetized.
334 AlternateErrorPageTabObserver::RegisterProfilePrefs(registry); 334 AlternateErrorPageTabObserver::RegisterProfilePrefs(registry);
335 apps::RegisterProfilePrefs(registry); 335 apps::RegisterProfilePrefs(registry);
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
442 442
443 #if defined(OS_MACOSX) 443 #if defined(OS_MACOSX)
444 RegisterBrowserActionsControllerProfilePrefs(registry); 444 RegisterBrowserActionsControllerProfilePrefs(registry);
445 #endif 445 #endif
446 446
447 #if defined(OS_WIN) 447 #if defined(OS_WIN)
448 NetworkProfileBubble::RegisterProfilePrefs(registry); 448 NetworkProfileBubble::RegisterProfilePrefs(registry);
449 #endif 449 #endif
450 450
451 #if defined(TOOLKIT_VIEWS) 451 #if defined(TOOLKIT_VIEWS)
452 RegisterBrowserViewProfilePrefs(registry);
452 RegisterInvertBubbleUserPrefs(registry); 453 RegisterInvertBubbleUserPrefs(registry);
453 #elif defined(TOOLKIT_GTK) 454 #elif defined(TOOLKIT_GTK)
454 BrowserWindowGtk::RegisterProfilePrefs(registry); 455 BrowserWindowGtk::RegisterProfilePrefs(registry);
455 #endif 456 #endif
456 457
457 #if defined(USE_ASH) 458 #if defined(USE_ASH)
458 ash::RegisterChromeLauncherUserPrefs(registry); 459 ash::RegisterChromeLauncherUserPrefs(registry);
459 #endif 460 #endif
460 461
461 // Prefs registered only for migration (clearing or moving to a new 462 // Prefs registered only for migration (clearing or moving to a new
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
571 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, 572 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
572 current_version); 573 current_version);
573 } 574 }
574 575
575 #if defined(OS_CHROMEOS) 576 #if defined(OS_CHROMEOS)
576 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); 577 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state);
577 #endif 578 #endif
578 } 579 }
579 580
580 } // namespace chrome 581 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/browser/resources/options/browser_options.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698