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

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

Issue 6118006: Save/Restore ALSA volume/mute (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/chrome/browser/chromeos
Patch Set: final fixing up 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) 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"
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
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/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/audio_mixer_alsa.h"
68 #include "chrome/browser/chromeos/login/apply_services_customization.h" 69 #include "chrome/browser/chromeos/login/apply_services_customization.h"
69 #include "chrome/browser/chromeos/login/signed_settings_temp_storage.h" 70 #include "chrome/browser/chromeos/login/signed_settings_temp_storage.h"
70 #include "chrome/browser/chromeos/login/user_manager.h" 71 #include "chrome/browser/chromeos/login/user_manager.h"
71 #include "chrome/browser/chromeos/login/wizard_controller.h" 72 #include "chrome/browser/chromeos/login/wizard_controller.h"
72 #include "chrome/browser/chromeos/preferences.h" 73 #include "chrome/browser/chromeos/preferences.h"
73 #include "chrome/browser/chromeos/status/input_method_menu_button.h" 74 #include "chrome/browser/chromeos/status/input_method_menu_button.h"
74 #include "chrome/browser/chromeos/user_cros_settings_provider.h" 75 #include "chrome/browser/chromeos/user_cros_settings_provider.h"
75 #endif 76 #endif
76 77
77 namespace browser { 78 namespace browser {
(...skipping 18 matching lines...) Expand all
96 #if defined(TOOLKIT_VIEWS) 97 #if defined(TOOLKIT_VIEWS)
97 BrowserView::RegisterBrowserViewPrefs(local_state); 98 BrowserView::RegisterBrowserViewPrefs(local_state);
98 #endif 99 #endif
99 UpgradeDetector::RegisterPrefs(local_state); 100 UpgradeDetector::RegisterPrefs(local_state);
100 TaskManager::RegisterPrefs(local_state); 101 TaskManager::RegisterPrefs(local_state);
101 geolocation::RegisterPrefs(local_state); 102 geolocation::RegisterPrefs(local_state);
102 AutoFillManager::RegisterBrowserPrefs(local_state); 103 AutoFillManager::RegisterBrowserPrefs(local_state);
103 BackgroundPageTracker::RegisterPrefs(local_state); 104 BackgroundPageTracker::RegisterPrefs(local_state);
104 NotificationUIManager::RegisterPrefs(local_state); 105 NotificationUIManager::RegisterPrefs(local_state);
105 #if defined(OS_CHROMEOS) 106 #if defined(OS_CHROMEOS)
107 chromeos::AudioMixerAlsa::RegisterPrefs(local_state);
106 chromeos::UserManager::RegisterPrefs(local_state); 108 chromeos::UserManager::RegisterPrefs(local_state);
107 chromeos::UserCrosSettingsProvider::RegisterPrefs(local_state); 109 chromeos::UserCrosSettingsProvider::RegisterPrefs(local_state);
108 WizardController::RegisterPrefs(local_state); 110 WizardController::RegisterPrefs(local_state);
109 chromeos::InputMethodMenuButton::RegisterPrefs(local_state); 111 chromeos::InputMethodMenuButton::RegisterPrefs(local_state);
110 chromeos::ApplyServicesCustomization::RegisterPrefs(local_state); 112 chromeos::ApplyServicesCustomization::RegisterPrefs(local_state);
111 chromeos::SignedSettingsTempStorage::RegisterPrefs(local_state); 113 chromeos::SignedSettingsTempStorage::RegisterPrefs(local_state);
112 #endif 114 #endif
113 } 115 }
114 116
115 void RegisterUserPrefs(PrefService* user_prefs) { 117 void RegisterUserPrefs(PrefService* user_prefs) {
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 chromeos::Preferences::RegisterUserPrefs(user_prefs); 151 chromeos::Preferences::RegisterUserPrefs(user_prefs);
150 #endif 152 #endif
151 BackgroundContentsService::RegisterUserPrefs(user_prefs); 153 BackgroundContentsService::RegisterUserPrefs(user_prefs);
152 SigninManager::RegisterUserPrefs(user_prefs); 154 SigninManager::RegisterUserPrefs(user_prefs);
153 TemplateURLModel::RegisterUserPrefs(user_prefs); 155 TemplateURLModel::RegisterUserPrefs(user_prefs);
154 InstantController::RegisterUserPrefs(user_prefs); 156 InstantController::RegisterUserPrefs(user_prefs);
155 NetPrefObserver::RegisterPrefs(user_prefs); 157 NetPrefObserver::RegisterPrefs(user_prefs);
156 } 158 }
157 159
158 } // namespace browser 160 } // namespace browser
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698