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

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

Issue 9814030: get rid of old options pages (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: chromeos fixes Created 8 years, 9 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/autofill/autofill_manager.h" 8 #include "chrome/browser/autofill/autofill_manager.h"
9 #include "chrome/browser/background/background_mode_manager.h" 9 #include "chrome/browser/background/background_mode_manager.h"
10 #include "chrome/browser/bookmarks/bookmark_model.h" 10 #include "chrome/browser/bookmarks/bookmark_model.h"
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" 50 #include "chrome/browser/search_engines/template_url_prepopulate_data.h"
51 #include "chrome/browser/tabs/pinned_tab_codec.h" 51 #include "chrome/browser/tabs/pinned_tab_codec.h"
52 #include "chrome/browser/task_manager/task_manager.h" 52 #include "chrome/browser/task_manager/task_manager.h"
53 #include "chrome/browser/translate/translate_prefs.h" 53 #include "chrome/browser/translate/translate_prefs.h"
54 #include "chrome/browser/ui/alternate_error_tab_observer.h" 54 #include "chrome/browser/ui/alternate_error_tab_observer.h"
55 #include "chrome/browser/ui/browser.h" 55 #include "chrome/browser/ui/browser.h"
56 #include "chrome/browser/ui/browser_init.h" 56 #include "chrome/browser/ui/browser_init.h"
57 #include "chrome/browser/ui/gesture_prefs.h" 57 #include "chrome/browser/ui/gesture_prefs.h"
58 #include "chrome/browser/ui/prefs/prefs_tab_helper.h" 58 #include "chrome/browser/ui/prefs/prefs_tab_helper.h"
59 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h" 59 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h"
60 #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h"
60 #include "chrome/browser/ui/webui/flags_ui.h" 61 #include "chrome/browser/ui/webui/flags_ui.h"
61 #include "chrome/browser/ui/webui/ntp/new_tab_page_handler.h" 62 #include "chrome/browser/ui/webui/ntp/new_tab_page_handler.h"
62 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" 63 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h"
63 #include "chrome/browser/ui/webui/options/extension_settings_handler.h"
64 #include "chrome/browser/ui/webui/plugins_ui.h" 64 #include "chrome/browser/ui/webui/plugins_ui.h"
65 #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h" 65 #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h"
66 #include "chrome/browser/upgrade_detector.h" 66 #include "chrome/browser/upgrade_detector.h"
67 #include "chrome/browser/web_resource/promo_resource_service.h" 67 #include "chrome/browser/web_resource/promo_resource_service.h"
68 #include "chrome/common/pref_names.h" 68 #include "chrome/common/pref_names.h"
69 #include "content/public/browser/render_process_host.h" 69 #include "content/public/browser/render_process_host.h"
70 70
71 #if defined(OS_MACOSX) 71 #if defined(OS_MACOSX)
72 #include "chrome/browser/ui/cocoa/confirm_quit.h" 72 #include "chrome/browser/ui/cocoa/confirm_quit.h"
73 #include "chrome/browser/ui/cocoa/presentation_mode_prefs.h" 73 #include "chrome/browser/ui/cocoa/presentation_mode_prefs.h"
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
280 } 280 }
281 local_state->ClearPref(prefs::kBrowserWindowPlacement); 281 local_state->ClearPref(prefs::kBrowserWindowPlacement);
282 282
283 current_version |= WINDOWS_PREFS; 283 current_version |= WINDOWS_PREFS;
284 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, 284 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
285 current_version); 285 current_version);
286 } 286 }
287 } 287 }
288 288
289 } // namespace browser 289 } // namespace browser
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698