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

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

Issue 15957008: Move NaCl related switches to their own file. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Try to fix the windows build (I don't have access to a windows machine) Created 7 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
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 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 #include "chrome/common/extensions/extension.h" 93 #include "chrome/common/extensions/extension.h"
94 #include "chrome/common/extensions/extension_process_policy.h" 94 #include "chrome/common/extensions/extension_process_policy.h"
95 #include "chrome/common/extensions/extension_set.h" 95 #include "chrome/common/extensions/extension_set.h"
96 #include "chrome/common/extensions/manifest_handlers/app_isolation_info.h" 96 #include "chrome/common/extensions/manifest_handlers/app_isolation_info.h"
97 #include "chrome/common/extensions/manifest_handlers/shared_module_info.h" 97 #include "chrome/common/extensions/manifest_handlers/shared_module_info.h"
98 #include "chrome/common/extensions/permissions/socket_permission.h" 98 #include "chrome/common/extensions/permissions/socket_permission.h"
99 #include "chrome/common/logging_chrome.h" 99 #include "chrome/common/logging_chrome.h"
100 #include "chrome/common/pref_names.h" 100 #include "chrome/common/pref_names.h"
101 #include "chrome/common/render_messages.h" 101 #include "chrome/common/render_messages.h"
102 #include "chrome/common/url_constants.h" 102 #include "chrome/common/url_constants.h"
103 #include "chrome/nacl/nacl_switches.h"
103 #include "chromeos/chromeos_constants.h" 104 #include "chromeos/chromeos_constants.h"
104 #include "components/user_prefs/pref_registry_syncable.h" 105 #include "components/user_prefs/pref_registry_syncable.h"
105 #include "content/public/browser/browser_child_process_host.h" 106 #include "content/public/browser/browser_child_process_host.h"
106 #include "content/public/browser/browser_main_parts.h" 107 #include "content/public/browser/browser_main_parts.h"
107 #include "content/public/browser/browser_ppapi_host.h" 108 #include "content/public/browser/browser_ppapi_host.h"
108 #include "content/public/browser/browser_url_handler.h" 109 #include "content/public/browser/browser_url_handler.h"
109 #include "content/public/browser/child_process_data.h" 110 #include "content/public/browser/child_process_data.h"
110 #include "content/public/browser/child_process_security_policy.h" 111 #include "content/public/browser/child_process_security_policy.h"
111 #include "content/public/browser/compositor_util.h" 112 #include "content/public/browser/compositor_util.h"
112 #include "content/public/browser/render_process_host.h" 113 #include "content/public/browser/render_process_host.h"
(...skipping 2171 matching lines...) Expand 10 before | Expand all | Expand 10 after
2284 #if defined(USE_NSS) 2285 #if defined(USE_NSS)
2285 crypto::CryptoModuleBlockingPasswordDelegate* 2286 crypto::CryptoModuleBlockingPasswordDelegate*
2286 ChromeContentBrowserClient::GetCryptoPasswordDelegate( 2287 ChromeContentBrowserClient::GetCryptoPasswordDelegate(
2287 const GURL& url) { 2288 const GURL& url) {
2288 return chrome::NewCryptoModuleBlockingDialogDelegate( 2289 return chrome::NewCryptoModuleBlockingDialogDelegate(
2289 chrome::kCryptoModulePasswordKeygen, url.host()); 2290 chrome::kCryptoModulePasswordKeygen, url.host());
2290 } 2291 }
2291 #endif 2292 #endif
2292 2293
2293 } // namespace chrome 2294 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/chrome_browser_main.cc ('k') | chrome/browser/component_updater/pnacl/pnacl_component_installer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698