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

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

Issue 3007008: Cleanup: Break another common->app dependency. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: minor fix Created 10 years, 5 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/app/chrome_version_info_posix.h.version ('k') | chrome/browser/browser_about_handler.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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/automation_provider.h" 5 #include "chrome/browser/automation/automation_provider.h"
6 6
7 #include <set> 7 #include <set>
8 8
9 #include "app/l10n_util.h" 9 #include "app/l10n_util.h"
10 #include "app/message_box_flags.h" 10 #include "app/message_box_flags.h"
11 #include "base/callback.h" 11 #include "base/callback.h"
12 #include "base/file_path.h" 12 #include "base/file_path.h"
13 #include "base/file_version_info.h" 13 #include "base/file_version_info.h"
14 #include "base/json/json_reader.h" 14 #include "base/json/json_reader.h"
15 #include "base/json/json_writer.h" 15 #include "base/json/json_writer.h"
16 #include "base/json/string_escape.h" 16 #include "base/json/string_escape.h"
17 #include "base/keyboard_codes.h" 17 #include "base/keyboard_codes.h"
18 #include "base/message_loop.h" 18 #include "base/message_loop.h"
19 #include "base/path_service.h" 19 #include "base/path_service.h"
20 #include "base/process_util.h" 20 #include "base/process_util.h"
21 #include "base/stl_util-inl.h" 21 #include "base/stl_util-inl.h"
22 #include "base/string_util.h" 22 #include "base/string_util.h"
23 #include "base/task.h" 23 #include "base/task.h"
24 #include "base/thread.h" 24 #include "base/thread.h"
25 #include "base/utf_string_conversions.h" 25 #include "base/utf_string_conversions.h"
26 #include "base/values.h" 26 #include "base/values.h"
27 #include "base/waitable_event.h" 27 #include "base/waitable_event.h"
28 #include "chrome/app/chrome_dll_resource.h" 28 #include "chrome/app/chrome_dll_resource.h"
29 #include "chrome/app/chrome_version_info.h"
30 #include "chrome/browser/app_modal_dialog.h" 29 #include "chrome/browser/app_modal_dialog.h"
31 #include "chrome/browser/app_modal_dialog_queue.h" 30 #include "chrome/browser/app_modal_dialog_queue.h"
32 #include "chrome/browser/autofill/autofill_manager.h" 31 #include "chrome/browser/autofill/autofill_manager.h"
33 #include "chrome/browser/automation/automation_extension_tracker.h" 32 #include "chrome/browser/automation/automation_extension_tracker.h"
34 #include "chrome/browser/automation/automation_provider_json.h" 33 #include "chrome/browser/automation/automation_provider_json.h"
35 #include "chrome/browser/automation/automation_provider_list.h" 34 #include "chrome/browser/automation/automation_provider_list.h"
36 #include "chrome/browser/automation/automation_provider_observers.h" 35 #include "chrome/browser/automation/automation_provider_observers.h"
37 #include "chrome/browser/automation/extension_port_container.h" 36 #include "chrome/browser/automation/extension_port_container.h"
38 #include "chrome/browser/autocomplete/autocomplete_edit.h" 37 #include "chrome/browser/autocomplete/autocomplete_edit.h"
39 #include "chrome/browser/blocked_popup_container.h" 38 #include "chrome/browser/blocked_popup_container.h"
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 #include "chrome/browser/renderer_host/render_process_host.h" 75 #include "chrome/browser/renderer_host/render_process_host.h"
77 #include "chrome/browser/renderer_host/render_view_host.h" 76 #include "chrome/browser/renderer_host/render_view_host.h"
78 #include "chrome/browser/ssl/ssl_manager.h" 77 #include "chrome/browser/ssl/ssl_manager.h"
79 #include "chrome/browser/ssl/ssl_blocking_page.h" 78 #include "chrome/browser/ssl/ssl_blocking_page.h"
80 #include "chrome/browser/tab_contents/infobar_delegate.h" 79 #include "chrome/browser/tab_contents/infobar_delegate.h"
81 #include "chrome/browser/tab_contents/tab_contents.h" 80 #include "chrome/browser/tab_contents/tab_contents.h"
82 #include "chrome/browser/tab_contents/tab_contents_view.h" 81 #include "chrome/browser/tab_contents/tab_contents_view.h"
83 #include "chrome/common/automation_constants.h" 82 #include "chrome/common/automation_constants.h"
84 #include "chrome/common/chrome_constants.h" 83 #include "chrome/common/chrome_constants.h"
85 #include "chrome/common/chrome_paths.h" 84 #include "chrome/common/chrome_paths.h"
85 #include "chrome/common/chrome_version_info.h"
86 #include "chrome/common/extensions/extension.h" 86 #include "chrome/common/extensions/extension.h"
87 #include "chrome/common/json_value_serializer.h" 87 #include "chrome/common/json_value_serializer.h"
88 #include "chrome/common/net/url_request_context_getter.h" 88 #include "chrome/common/net/url_request_context_getter.h"
89 #include "chrome/common/notification_service.h" 89 #include "chrome/common/notification_service.h"
90 #include "chrome/common/pref_names.h" 90 #include "chrome/common/pref_names.h"
91 #include "chrome/common/url_constants.h" 91 #include "chrome/common/url_constants.h"
92 #include "chrome/test/automation/automation_messages.h" 92 #include "chrome/test/automation/automation_messages.h"
93 #include "chrome/test/automation/tab_proxy.h" 93 #include "chrome/test/automation/tab_proxy.h"
94 #include "net/proxy/proxy_service.h" 94 #include "net/proxy/proxy_service.h"
95 #include "net/proxy/proxy_config_service_fixed.h" 95 #include "net/proxy/proxy_config_service_fixed.h"
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
187 g_browser_process->ReleaseModule(); 187 g_browser_process->ReleaseModule();
188 } 188 }
189 189
190 void AutomationProvider::ConnectToChannel(const std::string& channel_id) { 190 void AutomationProvider::ConnectToChannel(const std::string& channel_id) {
191 automation_resource_message_filter_ = new AutomationResourceMessageFilter; 191 automation_resource_message_filter_ = new AutomationResourceMessageFilter;
192 channel_.reset( 192 channel_.reset(
193 new IPC::SyncChannel(channel_id, IPC::Channel::MODE_CLIENT, this, 193 new IPC::SyncChannel(channel_id, IPC::Channel::MODE_CLIENT, this,
194 automation_resource_message_filter_, 194 automation_resource_message_filter_,
195 g_browser_process->io_thread()->message_loop(), 195 g_browser_process->io_thread()->message_loop(),
196 true, g_browser_process->shutdown_event())); 196 true, g_browser_process->shutdown_event()));
197 scoped_ptr<FileVersionInfo> version_info( 197 scoped_ptr<FileVersionInfo> version_info(chrome::GetChromeVersionInfo());
198 chrome_app::GetChromeVersionInfo());
199 std::string version_string; 198 std::string version_string;
200 if (version_info != NULL) { 199 if (version_info != NULL) {
201 version_string = WideToASCII(version_info->file_version()); 200 version_string = WideToASCII(version_info->file_version());
202 } 201 }
203 202
204 // Send a hello message with our current automation protocol version. 203 // Send a hello message with our current automation protocol version.
205 channel_->Send(new AutomationMsg_Hello(0, version_string.c_str())); 204 channel_->Send(new AutomationMsg_Hello(0, version_string.c_str()));
206 } 205 }
207 206
208 void AutomationProvider::SetExpectedTabCount(size_t expected_tabs) { 207 void AutomationProvider::SetExpectedTabCount(size_t expected_tabs) {
(...skipping 3824 matching lines...) Expand 10 before | Expand all | Expand 10 after
4033 } 4032 }
4034 4033
4035 void AutomationProvider::WaitForPopupMenuToOpen(IPC::Message* reply_message) { 4034 void AutomationProvider::WaitForPopupMenuToOpen(IPC::Message* reply_message) {
4036 NOTIMPLEMENTED(); 4035 NOTIMPLEMENTED();
4037 } 4036 }
4038 #endif // !defined(TOOLKIT_VIEWS) 4037 #endif // !defined(TOOLKIT_VIEWS)
4039 4038
4040 void AutomationProvider::ResetToDefaultTheme() { 4039 void AutomationProvider::ResetToDefaultTheme() {
4041 profile_->ClearTheme(); 4040 profile_->ClearTheme();
4042 } 4041 }
OLDNEW
« no previous file with comments | « chrome/app/chrome_version_info_posix.h.version ('k') | chrome/browser/browser_about_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698