| 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_frame/chrome_frame_automation.h" | 5 #include "chrome_frame/chrome_frame_automation.h" |
| 6 | 6 |
| 7 #include "base/callback.h" | 7 #include "base/callback.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/compiler_specific.h" | 9 #include "base/compiler_specific.h" |
| 10 #include "base/debug/trace_event.h" | 10 #include "base/debug/trace_event.h" |
| (...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 256 channel_id); | 256 channel_id); |
| 257 | 257 |
| 258 // Run Chrome in Chrome Frame mode. In practice, this modifies the paths | 258 // Run Chrome in Chrome Frame mode. In practice, this modifies the paths |
| 259 // and registry keys that Chrome looks in via the BrowserDistribution | 259 // and registry keys that Chrome looks in via the BrowserDistribution |
| 260 // mechanism. | 260 // mechanism. |
| 261 command_line->AppendSwitch(switches::kChromeFrame); | 261 command_line->AppendSwitch(switches::kChromeFrame); |
| 262 | 262 |
| 263 // Chrome Frame never wants Chrome to start up with a First Run UI. | 263 // Chrome Frame never wants Chrome to start up with a First Run UI. |
| 264 command_line->AppendSwitch(switches::kNoFirstRun); | 264 command_line->AppendSwitch(switches::kNoFirstRun); |
| 265 | 265 |
| 266 // Chrome Frame never wants to run background extensions since they |
| 267 // interfere with in-use updates. |
| 268 command_line->AppendSwitch(switches::kDisableBackgroundMode); |
| 269 |
| 266 command_line->AppendSwitch(switches::kDisablePopupBlocking); | 270 command_line->AppendSwitch(switches::kDisablePopupBlocking); |
| 267 | 271 |
| 268 // Disable the "Whoa! Chrome has crashed." dialog, because that isn't very | 272 // Disable the "Whoa! Chrome has crashed." dialog, because that isn't very |
| 269 // useful for Chrome Frame users. | 273 // useful for Chrome Frame users. |
| 270 #ifndef NDEBUG | 274 #ifndef NDEBUG |
| 271 command_line->AppendSwitch(switches::kNoErrorDialogs); | 275 command_line->AppendSwitch(switches::kNoErrorDialogs); |
| 272 #endif | 276 #endif |
| 273 | 277 |
| 274 // In headless mode runs like reliability test runs we want full crash dumps | 278 // In headless mode runs like reliability test runs we want full crash dumps |
| 275 // from chrome. | 279 // from chrome. |
| (...skipping 986 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1262 const net::URLRequestStatus& status) { | 1266 const net::URLRequestStatus& status) { |
| 1263 automation_server_->Send(new AutomationMsg_RequestEnd( | 1267 automation_server_->Send(new AutomationMsg_RequestEnd( |
| 1264 tab_->handle(), request_id, status)); | 1268 tab_->handle(), request_id, status)); |
| 1265 } | 1269 } |
| 1266 | 1270 |
| 1267 void ChromeFrameAutomationClient::OnCookiesRetrieved(bool success, | 1271 void ChromeFrameAutomationClient::OnCookiesRetrieved(bool success, |
| 1268 const GURL& url, const std::string& cookie_string, int cookie_id) { | 1272 const GURL& url, const std::string& cookie_string, int cookie_id) { |
| 1269 automation_server_->Send(new AutomationMsg_GetCookiesHostResponse( | 1273 automation_server_->Send(new AutomationMsg_GetCookiesHostResponse( |
| 1270 tab_->handle(), success, url, cookie_string, cookie_id)); | 1274 tab_->handle(), success, url, cookie_string, cookie_id)); |
| 1271 } | 1275 } |
| OLD | NEW |