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

Side by Side Diff: chrome/browser/chrome_content_browser_client.cc

Issue 14180010: Translate: browser test for Chrome Translate in an isolated world (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: factor out infobar check Created 7 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
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/browser/chrome_content_browser_client.h" 5 #include "chrome/browser/chrome_content_browser_client.h"
6 6
7 #include <set> 7 #include <set>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 1448 matching lines...) Expand 10 before | Expand all | Expand 10 after
1459 switches::kPpapiFlashArgs, 1459 switches::kPpapiFlashArgs,
1460 switches::kPpapiFlashInProcess, 1460 switches::kPpapiFlashInProcess,
1461 switches::kPpapiFlashPath, 1461 switches::kPpapiFlashPath,
1462 switches::kPpapiFlashVersion, 1462 switches::kPpapiFlashVersion,
1463 switches::kProfilingAtStart, 1463 switches::kProfilingAtStart,
1464 switches::kProfilingFile, 1464 switches::kProfilingFile,
1465 switches::kProfilingFlush, 1465 switches::kProfilingFlush,
1466 switches::kRecordMode, 1466 switches::kRecordMode,
1467 switches::kSilentDumpOnDCHECK, 1467 switches::kSilentDumpOnDCHECK,
1468 switches::kSpdyProxyAuthOrigin, 1468 switches::kSpdyProxyAuthOrigin,
1469 switches::kTranslateSecurityOrigin,
1469 switches::kWhitelistedExtensionID, 1470 switches::kWhitelistedExtensionID,
1470 }; 1471 };
1471 1472
1472 command_line->CopySwitchesFrom(browser_command_line, kSwitchNames, 1473 command_line->CopySwitchesFrom(browser_command_line, kSwitchNames,
1473 arraysize(kSwitchNames)); 1474 arraysize(kSwitchNames));
1474 } else if (process_type == switches::kUtilityProcess) { 1475 } else if (process_type == switches::kUtilityProcess) {
1475 static const char* const kSwitchNames[] = { 1476 static const char* const kSwitchNames[] = {
1476 extensions::switches::kExtensionsOnChromeURLs, 1477 extensions::switches::kExtensionsOnChromeURLs,
1477 switches::kAllowHTTPBackgroundPage, 1478 switches::kAllowHTTPBackgroundPage,
1478 switches::kEnableExperimentalExtensionApis, 1479 switches::kEnableExperimentalExtensionApis,
(...skipping 1075 matching lines...) Expand 10 before | Expand all | Expand 10 after
2554 #if defined(USE_NSS) 2555 #if defined(USE_NSS)
2555 crypto::CryptoModuleBlockingPasswordDelegate* 2556 crypto::CryptoModuleBlockingPasswordDelegate*
2556 ChromeContentBrowserClient::GetCryptoPasswordDelegate( 2557 ChromeContentBrowserClient::GetCryptoPasswordDelegate(
2557 const GURL& url) { 2558 const GURL& url) {
2558 return chrome::NewCryptoModuleBlockingDialogDelegate( 2559 return chrome::NewCryptoModuleBlockingDialogDelegate(
2559 chrome::kCryptoModulePasswordKeygen, url.host()); 2560 chrome::kCryptoModulePasswordKeygen, url.host());
2560 } 2561 }
2561 #endif 2562 #endif
2562 2563
2563 } // namespace chrome 2564 } // namespace chrome
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/translate/translate_browsertest.cc » ('j') | chrome/browser/translate/translate_browsertest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698