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

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: fix two memory bugs 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
« no previous file with comments | « no previous file | chrome/browser/translate/translate_browsertest.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) 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 1455 matching lines...) Expand 10 before | Expand all | Expand 10 after
1466 switches::kPpapiFlashArgs, 1466 switches::kPpapiFlashArgs,
1467 switches::kPpapiFlashInProcess, 1467 switches::kPpapiFlashInProcess,
1468 switches::kPpapiFlashPath, 1468 switches::kPpapiFlashPath,
1469 switches::kPpapiFlashVersion, 1469 switches::kPpapiFlashVersion,
1470 switches::kProfilingAtStart, 1470 switches::kProfilingAtStart,
1471 switches::kProfilingFile, 1471 switches::kProfilingFile,
1472 switches::kProfilingFlush, 1472 switches::kProfilingFlush,
1473 switches::kRecordMode, 1473 switches::kRecordMode,
1474 switches::kSilentDumpOnDCHECK, 1474 switches::kSilentDumpOnDCHECK,
1475 switches::kSpdyProxyAuthOrigin, 1475 switches::kSpdyProxyAuthOrigin,
1476 switches::kTranslateSecurityOrigin,
1476 switches::kWhitelistedExtensionID, 1477 switches::kWhitelistedExtensionID,
1477 }; 1478 };
1478 1479
1479 command_line->CopySwitchesFrom(browser_command_line, kSwitchNames, 1480 command_line->CopySwitchesFrom(browser_command_line, kSwitchNames,
1480 arraysize(kSwitchNames)); 1481 arraysize(kSwitchNames));
1481 } else if (process_type == switches::kUtilityProcess) { 1482 } else if (process_type == switches::kUtilityProcess) {
1482 static const char* const kSwitchNames[] = { 1483 static const char* const kSwitchNames[] = {
1483 extensions::switches::kEnableExperimentalExtensionApis, 1484 extensions::switches::kEnableExperimentalExtensionApis,
1484 extensions::switches::kExtensionsOnChromeURLs, 1485 extensions::switches::kExtensionsOnChromeURLs,
1485 switches::kAllowHTTPBackgroundPage, 1486 switches::kAllowHTTPBackgroundPage,
(...skipping 1066 matching lines...) Expand 10 before | Expand all | Expand 10 after
2552 #if defined(USE_NSS) 2553 #if defined(USE_NSS)
2553 crypto::CryptoModuleBlockingPasswordDelegate* 2554 crypto::CryptoModuleBlockingPasswordDelegate*
2554 ChromeContentBrowserClient::GetCryptoPasswordDelegate( 2555 ChromeContentBrowserClient::GetCryptoPasswordDelegate(
2555 const GURL& url) { 2556 const GURL& url) {
2556 return chrome::NewCryptoModuleBlockingDialogDelegate( 2557 return chrome::NewCryptoModuleBlockingDialogDelegate(
2557 chrome::kCryptoModulePasswordKeygen, url.host()); 2558 chrome::kCryptoModulePasswordKeygen, url.host());
2558 } 2559 }
2559 #endif 2560 #endif
2560 2561
2561 } // namespace chrome 2562 } // namespace chrome
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/translate/translate_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698