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 10387047: views: Refactor the way we register BrowserActionsContainer prefs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 7 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 | « no previous file | chrome/browser/ui/views/browser_actions_container.h » ('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) 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 "base/chromeos/chromeos_version.h" 7 #include "base/chromeos/chromeos_version.h"
8 #include "chrome/browser/about_flags.h" 8 #include "chrome/browser/about_flags.h"
9 #include "chrome/browser/autofill/autofill_manager.h" 9 #include "chrome/browser/autofill/autofill_manager.h"
10 #include "chrome/browser/background/background_mode_manager.h" 10 #include "chrome/browser/background/background_mode_manager.h"
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 #include "chrome/common/pref_names.h" 73 #include "chrome/common/pref_names.h"
74 #include "content/public/browser/render_process_host.h" 74 #include "content/public/browser/render_process_host.h"
75 75
76 #if defined(OS_MACOSX) 76 #if defined(OS_MACOSX)
77 #include "chrome/browser/ui/cocoa/confirm_quit.h" 77 #include "chrome/browser/ui/cocoa/confirm_quit.h"
78 #include "chrome/browser/ui/cocoa/presentation_mode_prefs.h" 78 #include "chrome/browser/ui/cocoa/presentation_mode_prefs.h"
79 #endif 79 #endif
80 80
81 #if defined(TOOLKIT_VIEWS) // TODO(port): whittle this down as we port 81 #if defined(TOOLKIT_VIEWS) // TODO(port): whittle this down as we port
82 #include "chrome/browser/accessibility/invert_bubble_views.h" 82 #include "chrome/browser/accessibility/invert_bubble_views.h"
83 #include "chrome/browser/ui/views/browser_actions_container.h"
84 #endif 83 #endif
85 84
86 #if defined(TOOLKIT_GTK) 85 #if defined(TOOLKIT_GTK)
87 #include "chrome/browser/ui/gtk/browser_window_gtk.h" 86 #include "chrome/browser/ui/gtk/browser_window_gtk.h"
88 #endif 87 #endif
89 88
90 #if defined(OS_CHROMEOS) 89 #if defined(OS_CHROMEOS)
91 #include "chrome/browser/chromeos/audio/audio_handler.h" 90 #include "chrome/browser/chromeos/audio/audio_handler.h"
92 #include "chrome/browser/chromeos/customization_document.h" 91 #include "chrome/browser/chromeos/customization_document.h"
93 #include "chrome/browser/chromeos/login/signed_settings_cache.h" 92 #include "chrome/browser/chromeos/login/signed_settings_cache.h"
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 203
205 #if defined(ENABLE_CONFIGURATION_POLICY) 204 #if defined(ENABLE_CONFIGURATION_POLICY)
206 policy::URLBlacklistManager::RegisterPrefs(user_prefs); 205 policy::URLBlacklistManager::RegisterPrefs(user_prefs);
207 #endif 206 #endif
208 207
209 #if defined(ENABLE_WEB_INTENTS) 208 #if defined(ENABLE_WEB_INTENTS)
210 web_intents::RegisterUserPrefs(user_prefs); 209 web_intents::RegisterUserPrefs(user_prefs);
211 #endif 210 #endif
212 211
213 #if defined(TOOLKIT_VIEWS) 212 #if defined(TOOLKIT_VIEWS)
214 BrowserActionsContainer::RegisterUserPrefs(user_prefs);
215 InvertBubble::RegisterUserPrefs(user_prefs); 213 InvertBubble::RegisterUserPrefs(user_prefs);
216 #elif defined(TOOLKIT_GTK) 214 #elif defined(TOOLKIT_GTK)
217 BrowserWindowGtk::RegisterUserPrefs(user_prefs); 215 BrowserWindowGtk::RegisterUserPrefs(user_prefs);
218 #endif 216 #endif
219 217
220 #if defined(USE_ASH) 218 #if defined(USE_ASH)
221 ChromeLauncherController::RegisterUserPrefs(user_prefs); 219 ChromeLauncherController::RegisterUserPrefs(user_prefs);
222 #endif 220 #endif
223 221
224 #if !defined(OS_ANDROID) 222 #if !defined(OS_ANDROID)
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
313 } 311 }
314 local_state->ClearPref(prefs::kLastPromptedGoogleURL); 312 local_state->ClearPref(prefs::kLastPromptedGoogleURL);
315 313
316 current_version |= GOOGLE_URL_TRACKER_PREFS; 314 current_version |= GOOGLE_URL_TRACKER_PREFS;
317 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, 315 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
318 current_version); 316 current_version);
319 } 317 }
320 } 318 }
321 319
322 } // namespace browser 320 } // namespace browser
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/views/browser_actions_container.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698