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

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

Issue 9379002: Move socket API restriction check to browser process (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: nit Created 8 years, 10 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 614 matching lines...) Expand 10 before | Expand all | Expand 10 after
625 if (local_state && 625 if (local_state &&
626 !local_state->GetBoolean(prefs::kPrintPreviewDisabled)) { 626 !local_state->GetBoolean(prefs::kPrintPreviewDisabled)) {
627 command_line->AppendSwitch(switches::kRendererPrintPreview); 627 command_line->AppendSwitch(switches::kRendererPrintPreview);
628 } 628 }
629 } 629 }
630 630
631 // Please keep this in alphabetical order. 631 // Please keep this in alphabetical order.
632 static const char* const kSwitchNames[] = { 632 static const char* const kSwitchNames[] = {
633 switches::kAllowHTTPBackgroundPage, 633 switches::kAllowHTTPBackgroundPage,
634 switches::kAllowLegacyExtensionManifests, 634 switches::kAllowLegacyExtensionManifests,
635 switches::kAllowNaClSocketAPI,
636 switches::kAllowScriptingGallery, 635 switches::kAllowScriptingGallery,
637 switches::kAppsCheckoutURL, 636 switches::kAppsCheckoutURL,
638 switches::kAppsGalleryURL, 637 switches::kAppsGalleryURL,
639 switches::kCloudPrintServiceURL, 638 switches::kCloudPrintServiceURL,
640 switches::kDebugPrint, 639 switches::kDebugPrint,
641 switches::kDumpHistogramsOnExit, 640 switches::kDumpHistogramsOnExit,
642 switches::kEnableBenchmarking, 641 switches::kEnableBenchmarking,
643 switches::kEnableCrxlessWebApps, 642 switches::kEnableCrxlessWebApps,
644 switches::kEnableExperimentalExtensionApis, 643 switches::kEnableExperimentalExtensionApis,
645 switches::kEnableInBrowserThumbnailing, 644 switches::kEnableInBrowserThumbnailing,
(...skipping 676 matching lines...) Expand 10 before | Expand all | Expand 10 after
1322 #if defined(USE_NSS) 1321 #if defined(USE_NSS)
1323 crypto::CryptoModuleBlockingPasswordDelegate* 1322 crypto::CryptoModuleBlockingPasswordDelegate*
1324 ChromeContentBrowserClient::GetCryptoPasswordDelegate( 1323 ChromeContentBrowserClient::GetCryptoPasswordDelegate(
1325 const GURL& url) { 1324 const GURL& url) {
1326 return browser::NewCryptoModuleBlockingDialogDelegate( 1325 return browser::NewCryptoModuleBlockingDialogDelegate(
1327 browser::kCryptoModulePasswordKeygen, url.host()); 1326 browser::kCryptoModulePasswordKeygen, url.host());
1328 } 1327 }
1329 #endif 1328 #endif
1330 1329
1331 } // namespace chrome 1330 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698