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

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

Issue 333193002: Adding a SW reporter component updater (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merged to ToT. Created 6 years, 6 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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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 <string>
8
7 #include "base/debug/trace_event.h" 9 #include "base/debug/trace_event.h"
8 #include "base/prefs/pref_registry_simple.h" 10 #include "base/prefs/pref_registry_simple.h"
9 #include "base/prefs/pref_service.h" 11 #include "base/prefs/pref_service.h"
10 #include "chrome/browser/about_flags.h" 12 #include "chrome/browser/about_flags.h"
11 #include "chrome/browser/accessibility/invert_bubble_prefs.h" 13 #include "chrome/browser/accessibility/invert_bubble_prefs.h"
12 #include "chrome/browser/apps/drive/drive_app_mapping.h" 14 #include "chrome/browser/apps/drive/drive_app_mapping.h"
13 #include "chrome/browser/apps/shortcut_manager.h" 15 #include "chrome/browser/apps/shortcut_manager.h"
14 #include "chrome/browser/autocomplete/zero_suggest_provider.h" 16 #include "chrome/browser/autocomplete/zero_suggest_provider.h"
15 #include "chrome/browser/background/background_mode_manager.h" 17 #include "chrome/browser/background/background_mode_manager.h"
16 #include "chrome/browser/browser_process_impl.h" 18 #include "chrome/browser/browser_process_impl.h"
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 #endif 180 #endif
179 181
180 #if defined(OS_MACOSX) 182 #if defined(OS_MACOSX)
181 #include "chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.h" 183 #include "chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.h"
182 #include "chrome/browser/ui/cocoa/confirm_quit.h" 184 #include "chrome/browser/ui/cocoa/confirm_quit.h"
183 #include "chrome/browser/ui/cocoa/extensions/browser_actions_controller_prefs.h" 185 #include "chrome/browser/ui/cocoa/extensions/browser_actions_controller_prefs.h"
184 #endif 186 #endif
185 187
186 #if defined(OS_WIN) 188 #if defined(OS_WIN)
187 #include "chrome/browser/apps/app_launch_for_metro_restart_win.h" 189 #include "chrome/browser/apps/app_launch_for_metro_restart_win.h"
190 #include "chrome/browser/component_updater/sw_reporter_installer_win.h"
188 #endif 191 #endif
189 192
190 #if defined(TOOLKIT_VIEWS) 193 #if defined(TOOLKIT_VIEWS)
191 #include "chrome/browser/ui/browser_view_prefs.h" 194 #include "chrome/browser/ui/browser_view_prefs.h"
192 #endif 195 #endif
193 196
194 #if defined(USE_ASH) 197 #if defined(USE_ASH)
195 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h" 198 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h"
196 #endif 199 #endif
197 200
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
322 policy::PolicyCertServiceFactory::RegisterPrefs(registry); 325 policy::PolicyCertServiceFactory::RegisterPrefs(registry);
323 #endif 326 #endif
324 327
325 #if defined(OS_MACOSX) 328 #if defined(OS_MACOSX)
326 confirm_quit::RegisterLocalState(registry); 329 confirm_quit::RegisterLocalState(registry);
327 QuitWithAppsController::RegisterPrefs(registry); 330 QuitWithAppsController::RegisterPrefs(registry);
328 #endif 331 #endif
329 332
330 #if defined(OS_WIN) 333 #if defined(OS_WIN)
331 app_metro_launch::RegisterPrefs(registry); 334 app_metro_launch::RegisterPrefs(registry);
335 component_updater::RegisterPrefsForSwReporter(registry);
332 password_manager::PasswordManager::RegisterLocalPrefs(registry); 336 password_manager::PasswordManager::RegisterLocalPrefs(registry);
333 #endif 337 #endif
334 338
335 #if defined(TOOLKIT_VIEWS) 339 #if defined(TOOLKIT_VIEWS)
336 RegisterBrowserViewLocalPrefs(registry); 340 RegisterBrowserViewLocalPrefs(registry);
337 #endif 341 #endif
338 } 342 }
339 343
340 // Register prefs applicable to all profiles. 344 // Register prefs applicable to all profiles.
341 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { 345 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
(...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after
592 #if defined(OS_CHROMEOS) 596 #if defined(OS_CHROMEOS)
593 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); 597 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state);
594 #endif 598 #endif
595 599
596 #if defined(TOOLKIT_VIEWS) 600 #if defined(TOOLKIT_VIEWS)
597 MigrateBrowserTabStripPrefs(local_state); 601 MigrateBrowserTabStripPrefs(local_state);
598 #endif 602 #endif
599 } 603 }
600 604
601 } // namespace chrome 605 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698