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

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

Issue 231733005: Delete the GTK+ port of Chrome. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remerge to ToT Created 6 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 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 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 180
181 #if defined(OS_WIN) 181 #if defined(OS_WIN)
182 #include "chrome/browser/apps/app_launch_for_metro_restart_win.h" 182 #include "chrome/browser/apps/app_launch_for_metro_restart_win.h"
183 #endif 183 #endif
184 184
185 #if defined(TOOLKIT_VIEWS) 185 #if defined(TOOLKIT_VIEWS)
186 #include "chrome/browser/ui/browser_view_prefs.h" 186 #include "chrome/browser/ui/browser_view_prefs.h"
187 #include "chrome/browser/ui/tabs/tab_strip_layout_type_prefs.h" 187 #include "chrome/browser/ui/tabs/tab_strip_layout_type_prefs.h"
188 #endif 188 #endif
189 189
190 #if defined(TOOLKIT_GTK)
191 #include "chrome/browser/ui/gtk/browser_window_gtk.h"
192 #endif
193
194 #if defined(USE_ASH) 190 #if defined(USE_ASH)
195 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h" 191 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h"
196 #endif 192 #endif
197 193
198 namespace { 194 namespace {
199 195
200 enum MigratedPreferences { 196 enum MigratedPreferences {
201 NO_PREFS = 0, 197 NO_PREFS = 0,
202 DNS_PREFS = 1 << 0, 198 DNS_PREFS = 1 << 0,
203 WINDOWS_PREFS = 1 << 1, 199 WINDOWS_PREFS = 1 << 1,
(...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after
455 RegisterBrowserActionsControllerProfilePrefs(registry); 451 RegisterBrowserActionsControllerProfilePrefs(registry);
456 #endif 452 #endif
457 453
458 #if defined(OS_WIN) 454 #if defined(OS_WIN)
459 NetworkProfileBubble::RegisterProfilePrefs(registry); 455 NetworkProfileBubble::RegisterProfilePrefs(registry);
460 #endif 456 #endif
461 457
462 #if defined(TOOLKIT_VIEWS) 458 #if defined(TOOLKIT_VIEWS)
463 RegisterBrowserViewProfilePrefs(registry); 459 RegisterBrowserViewProfilePrefs(registry);
464 RegisterInvertBubbleUserPrefs(registry); 460 RegisterInvertBubbleUserPrefs(registry);
465 #elif defined(TOOLKIT_GTK)
466 BrowserWindowGtk::RegisterProfilePrefs(registry);
467 #endif 461 #endif
468 462
469 #if defined(USE_ASH) 463 #if defined(USE_ASH)
470 ash::RegisterChromeLauncherUserPrefs(registry); 464 ash::RegisterChromeLauncherUserPrefs(registry);
471 #endif 465 #endif
472 466
473 // Prefs registered only for migration (clearing or moving to a new 467 // Prefs registered only for migration (clearing or moving to a new
474 // key) go here. 468 // key) go here.
475 registry->RegisterDictionaryPref( 469 registry->RegisterDictionaryPref(
476 kBackupPref, 470 kBackupPref,
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
583 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, 577 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
584 current_version); 578 current_version);
585 } 579 }
586 580
587 #if defined(OS_CHROMEOS) 581 #if defined(OS_CHROMEOS)
588 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); 582 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state);
589 #endif 583 #endif
590 } 584 }
591 585
592 } // namespace chrome 586 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698