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

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

Issue 6204002: Carnitas: Remove chrome/browser/views, update references. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Yay, more syncing Created 9 years, 11 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) 2010 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"
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 #include "chrome/browser/ssl/ssl_manager.h" 49 #include "chrome/browser/ssl/ssl_manager.h"
50 #include "chrome/browser/sync/signin_manager.h" 50 #include "chrome/browser/sync/signin_manager.h"
51 #include "chrome/browser/tab_contents/tab_contents.h" 51 #include "chrome/browser/tab_contents/tab_contents.h"
52 #include "chrome/browser/tabs/pinned_tab_codec.h" 52 #include "chrome/browser/tabs/pinned_tab_codec.h"
53 #include "chrome/browser/task_manager/task_manager.h" 53 #include "chrome/browser/task_manager/task_manager.h"
54 #include "chrome/browser/translate/translate_prefs.h" 54 #include "chrome/browser/translate/translate_prefs.h"
55 #include "chrome/browser/ui/browser.h" 55 #include "chrome/browser/ui/browser.h"
56 #include "chrome/browser/upgrade_detector.h" 56 #include "chrome/browser/upgrade_detector.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/views/browser_actions_container.h" 59 #include "chrome/browser/ui/views/browser_actions_container.h"
60 #include "chrome/browser/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/gtk/browser_window_gtk.h" 64 #include "chrome/browser/gtk/browser_window_gtk.h"
65 #endif 65 #endif
66 66
67 #if defined(OS_CHROMEOS) 67 #if defined(OS_CHROMEOS)
68 #include "chrome/browser/chromeos/login/apply_services_customization.h" 68 #include "chrome/browser/chromeos/login/apply_services_customization.h"
69 #include "chrome/browser/chromeos/login/signed_settings_temp_storage.h" 69 #include "chrome/browser/chromeos/login/signed_settings_temp_storage.h"
70 #include "chrome/browser/chromeos/login/user_manager.h" 70 #include "chrome/browser/chromeos/login/user_manager.h"
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 chromeos::Preferences::RegisterUserPrefs(user_prefs); 149 chromeos::Preferences::RegisterUserPrefs(user_prefs);
150 #endif 150 #endif
151 BackgroundContentsService::RegisterUserPrefs(user_prefs); 151 BackgroundContentsService::RegisterUserPrefs(user_prefs);
152 SigninManager::RegisterUserPrefs(user_prefs); 152 SigninManager::RegisterUserPrefs(user_prefs);
153 TemplateURLModel::RegisterUserPrefs(user_prefs); 153 TemplateURLModel::RegisterUserPrefs(user_prefs);
154 InstantController::RegisterUserPrefs(user_prefs); 154 InstantController::RegisterUserPrefs(user_prefs);
155 NetPrefObserver::RegisterPrefs(user_prefs); 155 NetPrefObserver::RegisterPrefs(user_prefs);
156 } 156 }
157 157
158 } // namespace browser 158 } // namespace browser
OLDNEW
« no previous file with comments | « chrome/browser/notifications/balloon_collection_win.cc ('k') | chrome/browser/printing/cloud_print/cloud_print_setup_flow.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698