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

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

Issue 8080004: Fix bug where --allow-running-insecure-content flag doesn't work against google.com sites in stab... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 2 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/browser_about_handler.h" 9 #include "chrome/browser/browser_about_handler.h"
10 #include "chrome/browser/browser_process.h" 10 #include "chrome/browser/browser_process.h"
(...skipping 332 matching lines...) Expand 10 before | Expand all | Expand 10 after
343 switches::kEnableInBrowserThumbnailing, 343 switches::kEnableInBrowserThumbnailing,
344 switches::kEnableIPCFuzzing, 344 switches::kEnableIPCFuzzing,
345 switches::kEnableNaCl, 345 switches::kEnableNaCl,
346 switches::kEnablePrintPreview, 346 switches::kEnablePrintPreview,
347 switches::kEnableResourceContentSettings, 347 switches::kEnableResourceContentSettings,
348 switches::kEnableSearchProviderApiV2, 348 switches::kEnableSearchProviderApiV2,
349 switches::kEnableWatchdog, 349 switches::kEnableWatchdog,
350 switches::kExperimentalSpellcheckerFeatures, 350 switches::kExperimentalSpellcheckerFeatures,
351 switches::kMemoryProfiling, 351 switches::kMemoryProfiling,
352 switches::kMessageLoopHistogrammer, 352 switches::kMessageLoopHistogrammer,
353 switches::kNoRunningInsecureContent,
353 switches::kPpapiFlashArgs, 354 switches::kPpapiFlashArgs,
354 switches::kPpapiFlashInProcess, 355 switches::kPpapiFlashInProcess,
355 switches::kPpapiFlashPath, 356 switches::kPpapiFlashPath,
356 switches::kPpapiFlashVersion, 357 switches::kPpapiFlashVersion,
357 switches::kProfilingAtStart, 358 switches::kProfilingAtStart,
358 switches::kProfilingFile, 359 switches::kProfilingFile,
359 switches::kProfilingFlush, 360 switches::kProfilingFlush,
360 switches::kSilentDumpOnDCHECK, 361 switches::kSilentDumpOnDCHECK,
361 switches::kEnableBenchmarking, 362 switches::kEnableBenchmarking,
362 }; 363 };
(...skipping 474 matching lines...) Expand 10 before | Expand all | Expand 10 after
837 #if defined(USE_NSS) 838 #if defined(USE_NSS)
838 crypto::CryptoModuleBlockingPasswordDelegate* 839 crypto::CryptoModuleBlockingPasswordDelegate*
839 ChromeContentBrowserClient::GetCryptoPasswordDelegate( 840 ChromeContentBrowserClient::GetCryptoPasswordDelegate(
840 const GURL& url) { 841 const GURL& url) {
841 return browser::NewCryptoModuleBlockingDialogDelegate( 842 return browser::NewCryptoModuleBlockingDialogDelegate(
842 browser::kCryptoModulePasswordKeygen, url.host()); 843 browser::kCryptoModulePasswordKeygen, url.host());
843 } 844 }
844 #endif 845 #endif
845 846
846 } // namespace chrome 847 } // namespace chrome
OLDNEW
« no previous file with comments | « no previous file | chrome/common/chrome_switches.h » ('j') | chrome/renderer/chrome_render_view_observer.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698