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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/browser/automation/testing_automation_provider_chromeos.cc

Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address review comments, merge to LKGR. Created 7 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/automation/testing_automation_provider.cc ('k') | chrome/browser/background/background_contents_service.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) 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/automation/testing_automation_provider.h" 5 #include "chrome/browser/automation/testing_automation_provider.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/shell_delegate.h" 8 #include "ash/shell_delegate.h"
9 #include "ash/system/tray/system_tray_delegate.h" 9 #include "ash/system/tray/system_tray_delegate.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
11 #include "base/i18n/time_formatting.h" 11 #include "base/i18n/time_formatting.h"
12 #include "base/prefs/pref_service.h"
12 #include "base/stringprintf.h" 13 #include "base/stringprintf.h"
13 #include "base/time.h" 14 #include "base/time.h"
14 #include "base/utf_string_conversions.h" 15 #include "base/utf_string_conversions.h"
15 #include "chrome/browser/automation/automation_provider_json.h" 16 #include "chrome/browser/automation/automation_provider_json.h"
16 #include "chrome/browser/automation/automation_provider_observers.h" 17 #include "chrome/browser/automation/automation_provider_observers.h"
17 #include "chrome/browser/automation/automation_util.h" 18 #include "chrome/browser/automation/automation_util.h"
18 #include "chrome/browser/browser_process.h" 19 #include "chrome/browser/browser_process.h"
19 #include "chrome/browser/chromeos/accessibility/accessibility_util.h" 20 #include "chrome/browser/chromeos/accessibility/accessibility_util.h"
20 #include "chrome/browser/chromeos/audio/audio_handler.h" 21 #include "chrome/browser/chromeos/audio/audio_handler.h"
21 #include "chrome/browser/chromeos/cros/cros_library.h" 22 #include "chrome/browser/chromeos/cros/cros_library.h"
22 #include "chrome/browser/chromeos/cros/network_library.h" 23 #include "chrome/browser/chromeos/cros/network_library.h"
23 #include "chrome/browser/chromeos/login/default_user_images.h" 24 #include "chrome/browser/chromeos/login/default_user_images.h"
24 #include "chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen. h" 25 #include "chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen. h"
25 #include "chrome/browser/chromeos/login/eula_screen.h" 26 #include "chrome/browser/chromeos/login/eula_screen.h"
26 #include "chrome/browser/chromeos/login/existing_user_controller.h" 27 #include "chrome/browser/chromeos/login/existing_user_controller.h"
27 #include "chrome/browser/chromeos/login/login_display.h" 28 #include "chrome/browser/chromeos/login/login_display.h"
28 #include "chrome/browser/chromeos/login/login_display_host.h" 29 #include "chrome/browser/chromeos/login/login_display_host.h"
29 #include "chrome/browser/chromeos/login/network_screen.h" 30 #include "chrome/browser/chromeos/login/network_screen.h"
30 #include "chrome/browser/chromeos/login/screen_locker.h" 31 #include "chrome/browser/chromeos/login/screen_locker.h"
31 #include "chrome/browser/chromeos/login/update_screen.h" 32 #include "chrome/browser/chromeos/login/update_screen.h"
32 #include "chrome/browser/chromeos/login/user_image_screen.h" 33 #include "chrome/browser/chromeos/login/user_image_screen.h"
33 #include "chrome/browser/chromeos/login/webui_login_display.h" 34 #include "chrome/browser/chromeos/login/webui_login_display.h"
34 #include "chrome/browser/chromeos/login/webui_login_display_host.h" 35 #include "chrome/browser/chromeos/login/webui_login_display_host.h"
35 #include "chrome/browser/chromeos/login/wizard_controller.h" 36 #include "chrome/browser/chromeos/login/wizard_controller.h"
36 #include "chrome/browser/chromeos/proxy_config_service_impl.h" 37 #include "chrome/browser/chromeos/proxy_config_service_impl.h"
37 #include "chrome/browser/chromeos/proxy_cros_settings_parser.h" 38 #include "chrome/browser/chromeos/proxy_cros_settings_parser.h"
38 #include "chrome/browser/chromeos/settings/cros_settings.h" 39 #include "chrome/browser/chromeos/settings/cros_settings.h"
39 #include "chrome/browser/chromeos/settings/cros_settings_names.h" 40 #include "chrome/browser/chromeos/settings/cros_settings_names.h"
40 #include "chrome/browser/chromeos/system/timezone_settings.h" 41 #include "chrome/browser/chromeos/system/timezone_settings.h"
41 #include "chrome/browser/prefs/pref_service.h"
42 #include "chrome/browser/ui/browser.h" 42 #include "chrome/browser/ui/browser.h"
43 #include "chrome/browser/ui/browser_window.h" 43 #include "chrome/browser/ui/browser_window.h"
44 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h" 44 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
45 #include "chrome/common/pref_names.h" 45 #include "chrome/common/pref_names.h"
46 #include "chromeos/dbus/dbus_thread_manager.h" 46 #include "chromeos/dbus/dbus_thread_manager.h"
47 #include "chromeos/dbus/power_manager_client.h" 47 #include "chromeos/dbus/power_manager_client.h"
48 #include "chromeos/dbus/session_manager_client.h" 48 #include "chromeos/dbus/session_manager_client.h"
49 #include "chromeos/dbus/update_engine_client.h" 49 #include "chromeos/dbus/update_engine_client.h"
50 #include "content/public/browser/web_contents.h" 50 #include "content/public/browser/web_contents.h"
51 #include "net/base/network_change_notifier.h" 51 #include "net/base/network_change_notifier.h"
(...skipping 1285 matching lines...) Expand 10 before | Expand all | Expand 10 after
1337 chromeos::DBusThreadManager::Get()->GetPowerManagerClient()-> 1337 chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->
1338 AddObserver(power_manager_observer_); 1338 AddObserver(power_manager_observer_);
1339 } 1339 }
1340 1340
1341 void TestingAutomationProvider::RemoveChromeosObservers() { 1341 void TestingAutomationProvider::RemoveChromeosObservers() {
1342 chromeos::DBusThreadManager::Get()->GetPowerManagerClient()-> 1342 chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->
1343 RemoveObserver(power_manager_observer_); 1343 RemoveObserver(power_manager_observer_);
1344 delete power_manager_observer_; 1344 delete power_manager_observer_;
1345 power_manager_observer_ = NULL; 1345 power_manager_observer_ = NULL;
1346 } 1346 }
OLDNEW
« no previous file with comments | « chrome/browser/automation/testing_automation_provider.cc ('k') | chrome/browser/background/background_contents_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698