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

Side by Side Diff: chrome/test/webdriver/webdriver_automation.cc

Issue 10832368: Revert 152037 (looks like the change was innocent) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 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/test/webdriver/test/chromedriver_tests.py ('k') | no next file » | 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) 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/test/webdriver/webdriver_automation.h" 5 #include "chrome/test/webdriver/webdriver_automation.h"
6 6
7 #if defined(OS_WIN) 7 #if defined(OS_WIN)
8 #include <windows.h> 8 #include <windows.h>
9 #endif 9 #endif
10 10
(...skipping 346 matching lines...) Expand 10 before | Expand all | Expand 10 after
357 command.AppendSwitch(switches::kNoSandbox); 357 command.AppendSwitch(switches::kNoSandbox);
358 } 358 }
359 command.AppendSwitch(switches::kEnableLogging); 359 command.AppendSwitch(switches::kEnableLogging);
360 command.AppendSwitchASCII(switches::kLoggingLevel, "1"); 360 command.AppendSwitchASCII(switches::kLoggingLevel, "1");
361 command.AppendSwitch(switches::kDisableHangMonitor); 361 command.AppendSwitch(switches::kDisableHangMonitor);
362 command.AppendSwitch(switches::kDisablePromptOnRepost); 362 command.AppendSwitch(switches::kDisablePromptOnRepost);
363 command.AppendSwitch(switches::kDomAutomationController); 363 command.AppendSwitch(switches::kDomAutomationController);
364 command.AppendSwitch(switches::kFullMemoryCrashReport); 364 command.AppendSwitch(switches::kFullMemoryCrashReport);
365 command.AppendSwitch(switches::kNoDefaultBrowserCheck); 365 command.AppendSwitch(switches::kNoDefaultBrowserCheck);
366 command.AppendSwitch(switches::kNoFirstRun); 366 command.AppendSwitch(switches::kNoFirstRun);
367 command.AppendSwitch(switches::kDisableBackgroundNetworking);
368 command.AppendSwitch(switches::kDisableSync);
369 command.AppendSwitch(switches::kDisableTranslate);
367 command.AppendSwitch(switches::kDisableWebResources); 370 command.AppendSwitch(switches::kDisableWebResources);
368 command.AppendSwitch(switches::kSbDisableAutoUpdate); 371 command.AppendSwitch(switches::kSbDisableAutoUpdate);
372 command.AppendSwitch(switches::kSbDisableDownloadProtection);
373 command.AppendSwitch(switches::kDisableClientSidePhishingDetection);
369 command.AppendSwitch(switches::kDisableComponentUpdate); 374 command.AppendSwitch(switches::kDisableComponentUpdate);
370 command.AppendSwitch(switches::kDisableDefaultApps); 375 command.AppendSwitch(switches::kDisableDefaultApps);
371 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) 376 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
372 command.AppendSwitchASCII(switches::kPasswordStore, "basic"); 377 command.AppendSwitchASCII(switches::kPasswordStore, "basic");
373 #endif 378 #endif
374 #if defined(OS_MACOSX) 379 #if defined(OS_MACOSX)
375 command.AppendSwitch(switches::kUseMockKeychain); 380 command.AppendSwitch(switches::kUseMockKeychain);
376 #endif 381 #endif
377 if (options.detach_process) 382 if (options.detach_process)
378 command.AppendSwitch(switches::kAutomationReinitializeOnChannelError); 383 command.AppendSwitch(switches::kAutomationReinitializeOnChannelError);
379 if (options.ignore_certificate_errors) 384 if (options.ignore_certificate_errors)
380 command.AppendSwitch(switches::kIgnoreCertificateErrors); 385 command.AppendSwitch(switches::kIgnoreCertificateErrors);
381 if (options.user_data_dir.empty()) 386 if (options.user_data_dir.empty())
382 command.AppendSwitchASCII(switches::kHomePage, chrome::kAboutBlankURL); 387 command.AppendArg(chrome::kAboutBlankURL);
383 388
384 command.AppendArguments(options.command, true /* include_program */); 389 command.AppendArguments(options.command, true /* include_program */);
385 390
386 // Find the Chrome binary. 391 // Find the Chrome binary.
387 if (command.GetProgram().empty()) { 392 if (command.GetProgram().empty()) {
388 FilePath browser_exe; 393 FilePath browser_exe;
389 if (!GetDefaultChromeExe(&browser_exe)) { 394 if (!GetDefaultChromeExe(&browser_exe)) {
390 *error = new Error(kUnknownError, "Could not find default Chrome binary"); 395 *error = new Error(kUnknownError, "Could not find default Chrome binary");
391 return; 396 return;
392 } 397 }
(...skipping 808 matching lines...) Expand 10 before | Expand all | Expand 10 after
1201 } 1206 }
1202 1207
1203 Error* Automation::CheckMaximizeSupported() { 1208 Error* Automation::CheckMaximizeSupported() {
1204 const char* message = 1209 const char* message =
1205 "Maximize automation interface is not supported for this version of " 1210 "Maximize automation interface is not supported for this version of "
1206 "Chrome."; 1211 "Chrome.";
1207 return CheckVersion(1160, message); 1212 return CheckVersion(1160, message);
1208 } 1213 }
1209 1214
1210 } // namespace webdriver 1215 } // namespace webdriver
OLDNEW
« no previous file with comments | « chrome/test/webdriver/test/chromedriver_tests.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698