| 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/automation_provider.h" | 5 #include "chrome/browser/automation/automation_provider.h" |
| 6 | 6 |
| 7 #include <set> | 7 #include <set> |
| 8 | 8 |
| 9 #include "base/callback.h" | 9 #include "base/callback.h" |
| 10 #include "base/debug/trace_event.h" | 10 #include "base/debug/trace_event.h" |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 48 #include "chrome/browser/download/save_package.h" | 48 #include "chrome/browser/download/save_package.h" |
| 49 #include "chrome/browser/extensions/crx_installer.h" | 49 #include "chrome/browser/extensions/crx_installer.h" |
| 50 #include "chrome/browser/extensions/extension_browser_event_router.h" | 50 #include "chrome/browser/extensions/extension_browser_event_router.h" |
| 51 #include "chrome/browser/extensions/extension_host.h" | 51 #include "chrome/browser/extensions/extension_host.h" |
| 52 #include "chrome/browser/extensions/extension_install_ui.h" | 52 #include "chrome/browser/extensions/extension_install_ui.h" |
| 53 #include "chrome/browser/extensions/extension_message_service.h" | 53 #include "chrome/browser/extensions/extension_message_service.h" |
| 54 #include "chrome/browser/extensions/extension_service.h" | 54 #include "chrome/browser/extensions/extension_service.h" |
| 55 #include "chrome/browser/extensions/extension_tabs_module.h" | 55 #include "chrome/browser/extensions/extension_tabs_module.h" |
| 56 #include "chrome/browser/extensions/extension_toolbar_model.h" | 56 #include "chrome/browser/extensions/extension_toolbar_model.h" |
| 57 #include "chrome/browser/extensions/user_script_master.h" | 57 #include "chrome/browser/extensions/user_script_master.h" |
| 58 #include "chrome/browser/io_thread.h" | |
| 59 #include "chrome/browser/net/url_request_mock_util.h" | 58 #include "chrome/browser/net/url_request_mock_util.h" |
| 60 #include "chrome/browser/platform_util.h" | 59 #include "chrome/browser/platform_util.h" |
| 61 #include "chrome/browser/prefs/pref_service.h" | 60 #include "chrome/browser/prefs/pref_service.h" |
| 62 #include "chrome/browser/printing/print_job.h" | 61 #include "chrome/browser/printing/print_job.h" |
| 63 #include "chrome/browser/profiles/profile_manager.h" | 62 #include "chrome/browser/profiles/profile_manager.h" |
| 64 #include "chrome/browser/ssl/ssl_blocking_page.h" | 63 #include "chrome/browser/ssl/ssl_blocking_page.h" |
| 65 #include "chrome/browser/ssl/ssl_manager.h" | 64 #include "chrome/browser/ssl/ssl_manager.h" |
| 66 #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog.h" | 65 #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog.h" |
| 67 #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog_queue.h" | 66 #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog_queue.h" |
| 68 #include "chrome/browser/ui/browser_list.h" | 67 #include "chrome/browser/ui/browser_list.h" |
| (...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 159 | 158 |
| 160 if (!automation_resource_message_filter_.get()) { | 159 if (!automation_resource_message_filter_.get()) { |
| 161 automation_resource_message_filter_ = new AutomationResourceMessageFilter; | 160 automation_resource_message_filter_ = new AutomationResourceMessageFilter; |
| 162 } | 161 } |
| 163 | 162 |
| 164 channel_.reset(new IPC::SyncChannel( | 163 channel_.reset(new IPC::SyncChannel( |
| 165 effective_channel_id, | 164 effective_channel_id, |
| 166 use_named_interface ? IPC::Channel::MODE_NAMED_SERVER | 165 use_named_interface ? IPC::Channel::MODE_NAMED_SERVER |
| 167 : IPC::Channel::MODE_CLIENT, | 166 : IPC::Channel::MODE_CLIENT, |
| 168 this, | 167 this, |
| 169 g_browser_process->io_thread()->message_loop(), | 168 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO), |
| 170 true, g_browser_process->shutdown_event())); | 169 true, g_browser_process->shutdown_event())); |
| 171 channel_->AddFilter(automation_resource_message_filter_); | 170 channel_->AddFilter(automation_resource_message_filter_); |
| 172 | 171 |
| 173 #if defined(OS_CHROMEOS) | 172 #if defined(OS_CHROMEOS) |
| 174 // Wait for the network manager to initialize. | 173 // Wait for the network manager to initialize. |
| 175 // The observer will delete itself when done. | 174 // The observer will delete itself when done. |
| 176 network_library_initialized_ = false; | 175 network_library_initialized_ = false; |
| 177 NetworkManagerInitObserver* observer = new NetworkManagerInitObserver(this); | 176 NetworkManagerInitObserver* observer = new NetworkManagerInitObserver(this); |
| 178 if (!observer->Init()) | 177 if (!observer->Init()) |
| 179 delete observer; | 178 delete observer; |
| (...skipping 780 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 960 | 959 |
| 961 void AutomationProvider::SaveAsAsync(int tab_handle) { | 960 void AutomationProvider::SaveAsAsync(int tab_handle) { |
| 962 NavigationController* tab = NULL; | 961 NavigationController* tab = NULL; |
| 963 TabContents* tab_contents = GetTabContentsForHandle(tab_handle, &tab); | 962 TabContents* tab_contents = GetTabContentsForHandle(tab_handle, &tab); |
| 964 if (tab_contents) { | 963 if (tab_contents) { |
| 965 TabContentsWrapper* wrapper = | 964 TabContentsWrapper* wrapper = |
| 966 TabContentsWrapper::GetCurrentWrapperForContents(tab_contents); | 965 TabContentsWrapper::GetCurrentWrapperForContents(tab_contents); |
| 967 wrapper->download_tab_helper()->OnSavePage(); | 966 wrapper->download_tab_helper()->OnSavePage(); |
| 968 } | 967 } |
| 969 } | 968 } |
| OLD | NEW |