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

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

Issue 22394006: Get rid of webkit/plugins/plugin_switches.* and move them to content/public/common/content_switches… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: 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/chromeos/login/chrome_restart_request.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 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 #include "net/base/mime_util.h" 133 #include "net/base/mime_util.h"
134 #include "net/cookies/canonical_cookie.h" 134 #include "net/cookies/canonical_cookie.h"
135 #include "net/cookies/cookie_options.h" 135 #include "net/cookies/cookie_options.h"
136 #include "net/ssl/ssl_cert_request_info.h" 136 #include "net/ssl/ssl_cert_request_info.h"
137 #include "ppapi/host/ppapi_host.h" 137 #include "ppapi/host/ppapi_host.h"
138 #include "ui/base/l10n/l10n_util.h" 138 #include "ui/base/l10n/l10n_util.h"
139 #include "ui/base/resource/resource_bundle.h" 139 #include "ui/base/resource/resource_bundle.h"
140 #include "ui/message_center/message_center_util.h" 140 #include "ui/message_center/message_center_util.h"
141 #include "webkit/browser/fileapi/external_mount_points.h" 141 #include "webkit/browser/fileapi/external_mount_points.h"
142 #include "webkit/common/webpreferences.h" 142 #include "webkit/common/webpreferences.h"
143 #include "webkit/plugins/plugin_switches.h"
144 143
145 #if defined(OS_WIN) 144 #if defined(OS_WIN)
146 #include "chrome/browser/chrome_browser_main_win.h" 145 #include "chrome/browser/chrome_browser_main_win.h"
147 #include "sandbox/win/src/sandbox_policy.h" 146 #include "sandbox/win/src/sandbox_policy.h"
148 #elif defined(OS_MACOSX) 147 #elif defined(OS_MACOSX)
149 #include "chrome/browser/chrome_browser_main_mac.h" 148 #include "chrome/browser/chrome_browser_main_mac.h"
150 #include "chrome/browser/spellchecker/spellcheck_message_filter_mac.h" 149 #include "chrome/browser/spellchecker/spellcheck_message_filter_mac.h"
151 #elif defined(OS_CHROMEOS) 150 #elif defined(OS_CHROMEOS)
152 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h" 151 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h"
153 #include "chrome/browser/chromeos/drive/file_system_backend_delegate.h" 152 #include "chrome/browser/chromeos/drive/file_system_backend_delegate.h"
(...skipping 2399 matching lines...) Expand 10 before | Expand all | Expand 10 after
2553 #if defined(USE_NSS) 2552 #if defined(USE_NSS)
2554 crypto::CryptoModuleBlockingPasswordDelegate* 2553 crypto::CryptoModuleBlockingPasswordDelegate*
2555 ChromeContentBrowserClient::GetCryptoPasswordDelegate( 2554 ChromeContentBrowserClient::GetCryptoPasswordDelegate(
2556 const GURL& url) { 2555 const GURL& url) {
2557 return chrome::NewCryptoModuleBlockingDialogDelegate( 2556 return chrome::NewCryptoModuleBlockingDialogDelegate(
2558 chrome::kCryptoModulePasswordKeygen, url.host()); 2557 chrome::kCryptoModulePasswordKeygen, url.host());
2559 } 2558 }
2560 #endif 2559 #endif
2561 2560
2562 } // namespace chrome 2561 } // namespace chrome
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/chrome_restart_request.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698