OLD | NEW |
---|---|
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/automation/testing_automation_provider.h" | 5 #include "chrome/browser/automation/testing_automation_provider.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/i18n/time_formatting.h" | 8 #include "base/i18n/time_formatting.h" |
9 #include "base/stringprintf.h" | 9 #include "base/stringprintf.h" |
10 #include "base/time.h" | 10 #include "base/time.h" |
11 #include "base/utf_string_conversions.h" | 11 #include "base/utf_string_conversions.h" |
12 #include "chrome/browser/automation/automation_provider_json.h" | 12 #include "chrome/browser/automation/automation_provider_json.h" |
13 #include "chrome/browser/automation/automation_provider_observers.h" | 13 #include "chrome/browser/automation/automation_provider_observers.h" |
14 #include "chrome/browser/browser_process.h" | 14 #include "chrome/browser/browser_process.h" |
15 #include "chrome/browser/chromeos/audio_handler.h" | 15 #include "chrome/browser/chromeos/audio_handler.h" |
16 #include "chrome/browser/chromeos/cros_settings.h" | |
Mattias Nissler (ping if slow)
2011/11/18 14:12:00
needed?
pastarmovj
2011/11/18 15:01:38
Nope rebasing artifact the real code change is obs
| |
16 #include "chrome/browser/chromeos/cros/cros_library.h" | 17 #include "chrome/browser/chromeos/cros/cros_library.h" |
17 #include "chrome/browser/chromeos/cros/network_library.h" | 18 #include "chrome/browser/chromeos/cros/network_library.h" |
18 #include "chrome/browser/chromeos/cros/power_library.h" | 19 #include "chrome/browser/chromeos/cros/power_library.h" |
19 #include "chrome/browser/chromeos/cros/screen_lock_library.h" | 20 #include "chrome/browser/chromeos/cros/screen_lock_library.h" |
20 #include "chrome/browser/chromeos/cros/update_library.h" | 21 #include "chrome/browser/chromeos/cros/update_library.h" |
21 #include "chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen. h" | 22 #include "chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen. h" |
22 #include "chrome/browser/chromeos/login/existing_user_controller.h" | 23 #include "chrome/browser/chromeos/login/existing_user_controller.h" |
23 #include "chrome/browser/chromeos/login/login_display.h" | 24 #include "chrome/browser/chromeos/login/login_display.h" |
24 #include "chrome/browser/chromeos/login/login_display_host.h" | 25 #include "chrome/browser/chromeos/login/login_display_host.h" |
25 #include "chrome/browser/chromeos/login/screen_locker.h" | 26 #include "chrome/browser/chromeos/login/screen_locker.h" |
(...skipping 1115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1141 views::Widget* window = browser::CreateViewsWindow( | 1142 views::Widget* window = browser::CreateViewsWindow( |
1142 browser->window()->GetNativeHandle(), take_photo_dialog); | 1143 browser->window()->GetNativeHandle(), take_photo_dialog); |
1143 window->SetAlwaysOnTop(true); | 1144 window->SetAlwaysOnTop(true); |
1144 window->Show(); | 1145 window->Show(); |
1145 } | 1146 } |
1146 | 1147 |
1147 void TestingAutomationProvider::PowerChanged( | 1148 void TestingAutomationProvider::PowerChanged( |
1148 const chromeos::PowerSupplyStatus& status) { | 1149 const chromeos::PowerSupplyStatus& status) { |
1149 power_status = status; | 1150 power_status = status; |
1150 } | 1151 } |
OLD | NEW |