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

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

Issue 6532045: WebUI: Move more files from chrome/browser/dom_ui to chrome/browser/webui. Part 4. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 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/platform_util_chromeos.cc ('k') | chrome/browser/ui/browser.cc » ('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 (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_contents_service.h" 9 #include "chrome/browser/background_contents_service.h"
10 #include "chrome/browser/background_mode_manager.h" 10 #include "chrome/browser/background_mode_manager.h"
11 #include "chrome/browser/background_page_tracker.h" 11 #include "chrome/browser/background_page_tracker.h"
12 #include "chrome/browser/bookmarks/bookmark_utils.h" 12 #include "chrome/browser/bookmarks/bookmark_utils.h"
13 #include "chrome/browser/browser_shutdown.h" 13 #include "chrome/browser/browser_shutdown.h"
14 #include "chrome/browser/content_settings/host_content_settings_map.h" 14 #include "chrome/browser/content_settings/host_content_settings_map.h"
15 #include "chrome/browser/debugger/devtools_manager.h" 15 #include "chrome/browser/debugger/devtools_manager.h"
16 #include "chrome/browser/dom_ui/new_tab_ui.h" 16 #include "chrome/browser/dom_ui/new_tab_ui.h"
17 #include "chrome/browser/dom_ui/plugins_ui.h"
18 #include "chrome/browser/download/download_prefs.h" 17 #include "chrome/browser/download/download_prefs.h"
19 #include "chrome/browser/extensions/extension_prefs.h" 18 #include "chrome/browser/extensions/extension_prefs.h"
20 #include "chrome/browser/extensions/extension_web_ui.h" 19 #include "chrome/browser/extensions/extension_web_ui.h"
21 #include "chrome/browser/extensions/extensions_ui.h" 20 #include "chrome/browser/extensions/extensions_ui.h"
22 #include "chrome/browser/external_protocol_handler.h" 21 #include "chrome/browser/external_protocol_handler.h"
23 #include "chrome/browser/geolocation/geolocation_content_settings_map.h" 22 #include "chrome/browser/geolocation/geolocation_content_settings_map.h"
24 #include "chrome/browser/geolocation/geolocation_prefs.h" 23 #include "chrome/browser/geolocation/geolocation_prefs.h"
25 #include "chrome/browser/google/google_url_tracker.h" 24 #include "chrome/browser/google/google_url_tracker.h"
26 #include "chrome/browser/host_zoom_map.h" 25 #include "chrome/browser/host_zoom_map.h"
27 #include "chrome/browser/instant/instant_controller.h" 26 #include "chrome/browser/instant/instant_controller.h"
(...skipping 18 matching lines...) Expand all
46 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" 45 #include "chrome/browser/search_engines/template_url_prepopulate_data.h"
47 #include "chrome/browser/ssl/ssl_manager.h" 46 #include "chrome/browser/ssl/ssl_manager.h"
48 #include "chrome/browser/sync/signin_manager.h" 47 #include "chrome/browser/sync/signin_manager.h"
49 #include "chrome/browser/tab_contents/tab_contents.h" 48 #include "chrome/browser/tab_contents/tab_contents.h"
50 #include "chrome/browser/tabs/pinned_tab_codec.h" 49 #include "chrome/browser/tabs/pinned_tab_codec.h"
51 #include "chrome/browser/task_manager/task_manager.h" 50 #include "chrome/browser/task_manager/task_manager.h"
52 #include "chrome/browser/translate/translate_prefs.h" 51 #include "chrome/browser/translate/translate_prefs.h"
53 #include "chrome/browser/ui/browser.h" 52 #include "chrome/browser/ui/browser.h"
54 #include "chrome/browser/upgrade_detector.h" 53 #include "chrome/browser/upgrade_detector.h"
55 #include "chrome/browser/webui/flags_ui.h" 54 #include "chrome/browser/webui/flags_ui.h"
55 #include "chrome/browser/webui/plugins_ui.h"
56 #include "chrome/common/pref_names.h" 56 #include "chrome/common/pref_names.h"
57 57
58 #if defined(TOOLKIT_VIEWS) // TODO(port): whittle this down as we port 58 #if defined(TOOLKIT_VIEWS) // TODO(port): whittle this down as we port
59 #include "chrome/browser/ui/views/browser_actions_container.h" 59 #include "chrome/browser/ui/views/browser_actions_container.h"
60 #include "chrome/browser/ui/views/frame/browser_view.h" 60 #include "chrome/browser/ui/views/frame/browser_view.h"
61 #endif 61 #endif
62 62
63 #if defined(TOOLKIT_GTK) 63 #if defined(TOOLKIT_GTK)
64 #include "chrome/browser/ui/gtk/browser_window_gtk.h" 64 #include "chrome/browser/ui/gtk/browser_window_gtk.h"
65 #endif 65 #endif
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 GetValue())); 181 GetValue()));
182 } 182 }
183 local_state->ClearPref(prefs::kBrowserWindowPlacement); 183 local_state->ClearPref(prefs::kBrowserWindowPlacement);
184 184
185 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, 185 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
186 current_version | WINDOWS_PREFS); 186 current_version | WINDOWS_PREFS);
187 } 187 }
188 } 188 }
189 189
190 } // namespace browser 190 } // namespace browser
OLDNEW
« no previous file with comments | « chrome/browser/platform_util_chromeos.cc ('k') | chrome/browser/ui/browser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698