chrome/browser/automation/testing_automation_provider_chromeos.cc - Issue 10391158: Moves methods for finding browsers to browser_finder.

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

Issue 10391158: Moves methods for finding browsers to browser_finder. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Include fixs 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 | « chrome/browser/automation/testing_automation_provider.cc ('k') | chrome/browser/automation/testing_automation_provider_win.cc » ('j') | chrome/browser/ui/browser_finder.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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/system/tray/system_tray_delegate.h"	8 #include "ash/system/tray/system_tray_delegate.h"

9 #include "base/command_line.h"	9 #include "base/command_line.h"

10 #include "base/i18n/time_formatting.h"	10 #include "base/i18n/time_formatting.h"

(...skipping 17 matching lines...) Expand all Loading...
28 #include "chrome/browser/chromeos/login/wizard_controller.h"	28 #include "chrome/browser/chromeos/login/wizard_controller.h"

29 #include "chrome/browser/chromeos/options/take_photo_dialog.h"	29 #include "chrome/browser/chromeos/options/take_photo_dialog.h"

30 #include "chrome/browser/chromeos/proxy_cros_settings_parser.h"	30 #include "chrome/browser/chromeos/proxy_cros_settings_parser.h"

31 #include "chrome/browser/chromeos/system/timezone_settings.h"	31 #include "chrome/browser/chromeos/system/timezone_settings.h"

32 #include "chrome/browser/policy/browser_policy_connector.h"	32 #include "chrome/browser/policy/browser_policy_connector.h"

33 #include "chrome/browser/policy/cloud_policy_cache_base.h"	33 #include "chrome/browser/policy/cloud_policy_cache_base.h"

34 #include "chrome/browser/policy/cloud_policy_data_store.h"	34 #include "chrome/browser/policy/cloud_policy_data_store.h"

35 #include "chrome/browser/policy/cloud_policy_subsystem.h"	35 #include "chrome/browser/policy/cloud_policy_subsystem.h"

36 #include "chrome/browser/policy/enterprise_install_attributes.h"	36 #include "chrome/browser/policy/enterprise_install_attributes.h"

37 #include "chrome/browser/prefs/pref_service.h"	37 #include "chrome/browser/prefs/pref_service.h"

	38 #include "chrome/browser/ui/browser.h"

38 #include "chrome/browser/ui/browser_window.h"	39 #include "chrome/browser/ui/browser_window.h"

39 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"	40 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"

40 #include "chrome/common/pref_names.h"	41 #include "chrome/common/pref_names.h"

41 #include "chromeos/dbus/dbus_thread_manager.h"	42 #include "chromeos/dbus/dbus_thread_manager.h"

42 #include "chromeos/dbus/power_manager_client.h"	43 #include "chromeos/dbus/power_manager_client.h"

43 #include "chromeos/dbus/update_engine_client.h"	44 #include "chromeos/dbus/update_engine_client.h"

44 #include "content/public/browser/web_contents.h"	45 #include "content/public/browser/web_contents.h"

45 #include "net/base/network_change_notifier.h"	46 #include "net/base/network_change_notifier.h"

46 #include "policy/policy_constants.h"	47 #include "policy/policy_constants.h"

47 #include "ui/views/widget/widget.h"	48 #include "ui/views/widget/widget.h"

(...skipping 1199 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1247 chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->	1248 chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->

1248 AddObserver(power_manager_observer_);	1249 AddObserver(power_manager_observer_);

1249 }	1250 }

1250	1251

1251 void TestingAutomationProvider::RemoveChromeosObservers() {	1252 void TestingAutomationProvider::RemoveChromeosObservers() {

1252 chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->	1253 chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->

1253 RemoveObserver(power_manager_observer_);	1254 RemoveObserver(power_manager_observer_);

1254 delete power_manager_observer_;	1255 delete power_manager_observer_;

1255 power_manager_observer_ = NULL;	1256 power_manager_observer_ = NULL;

1256 }	1257 }

OLD	NEW