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

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

Issue 7253001: Added a private chromeAuthPrivate API. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed unittest failure Created 9 years, 6 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) 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/chrome_content_browser_client.h" 5 #include "chrome/browser/chrome_content_browser_client.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "chrome/app/breakpad_mac.h" 8 #include "chrome/app/breakpad_mac.h"
9 #include "chrome/browser/accessibility/browser_accessibility_state.h" 9 #include "chrome/browser/accessibility/browser_accessibility_state.h"
10 #include "chrome/browser/browser_process.h" 10 #include "chrome/browser/browser_process.h"
(...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after
256 // Disable client-side phishing detection in the renderer if it is disabled 256 // Disable client-side phishing detection in the renderer if it is disabled
257 // in the browser process. 257 // in the browser process.
258 if (!g_browser_process->safe_browsing_detection_service()) 258 if (!g_browser_process->safe_browsing_detection_service())
259 command_line->AppendSwitch(switches::kDisableClientSidePhishingDetection); 259 command_line->AppendSwitch(switches::kDisableClientSidePhishingDetection);
260 260
261 static const char* const kSwitchNames[] = { 261 static const char* const kSwitchNames[] = {
262 switches::kAllowHTTPBackgroundPage, 262 switches::kAllowHTTPBackgroundPage,
263 switches::kAllowScriptingGallery, 263 switches::kAllowScriptingGallery,
264 switches::kAppsCheckoutURL, 264 switches::kAppsCheckoutURL,
265 switches::kAppsGalleryURL, 265 switches::kAppsGalleryURL,
266 switches::kCloudPrintServiceURL,
266 switches::kDebugPrint, 267 switches::kDebugPrint,
267 #if defined(GOOGLE_CHROME_BUILD) && !defined(OS_CHROMEOS) && !defined(OS_MACOSX) 268 #if defined(GOOGLE_CHROME_BUILD) && !defined(OS_CHROMEOS) && !defined(OS_MACOSX)
268 // Enabled by default in Google Chrome builds, except on CrOS. 269 // Enabled by default in Google Chrome builds, except on CrOS.
269 switches::kDisablePrintPreview, 270 switches::kDisablePrintPreview,
270 #else 271 #else
271 // Disabled by default in Chromium builds and on CrOS. 272 // Disabled by default in Chromium builds and on CrOS.
272 switches::kEnablePrintPreview, 273 switches::kEnablePrintPreview,
273 #endif 274 #endif
274 switches::kDomAutomationController, 275 switches::kDomAutomationController,
275 switches::kDumpHistogramsOnExit, 276 switches::kDumpHistogramsOnExit,
(...skipping 326 matching lines...) Expand 10 before | Expand all | Expand 10 after
602 #if defined(USE_NSS) 603 #if defined(USE_NSS)
603 crypto::CryptoModuleBlockingPasswordDelegate* 604 crypto::CryptoModuleBlockingPasswordDelegate*
604 ChromeContentBrowserClient::GetCryptoPasswordDelegate( 605 ChromeContentBrowserClient::GetCryptoPasswordDelegate(
605 const GURL& url) { 606 const GURL& url) {
606 return browser::NewCryptoModuleBlockingDialogDelegate( 607 return browser::NewCryptoModuleBlockingDialogDelegate(
607 browser::kCryptoModulePasswordKeygen, url.host()); 608 browser::kCryptoModulePasswordKeygen, url.host());
608 } 609 }
609 #endif 610 #endif
610 611
611 } // namespace chrome 612 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/browser_resources.grd ('k') | chrome/browser/extensions/extension_chrome_auth_private_api.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698