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

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

Issue 16216007: split webkit/glue/webpreferences to common and renderer (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase 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 | 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 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 #include "grit/ui_resources.h" 123 #include "grit/ui_resources.h"
124 #include "net/base/escape.h" 124 #include "net/base/escape.h"
125 #include "net/base/mime_util.h" 125 #include "net/base/mime_util.h"
126 #include "net/cookies/canonical_cookie.h" 126 #include "net/cookies/canonical_cookie.h"
127 #include "net/cookies/cookie_options.h" 127 #include "net/cookies/cookie_options.h"
128 #include "net/ssl/ssl_cert_request_info.h" 128 #include "net/ssl/ssl_cert_request_info.h"
129 #include "ppapi/host/ppapi_host.h" 129 #include "ppapi/host/ppapi_host.h"
130 #include "ui/base/l10n/l10n_util.h" 130 #include "ui/base/l10n/l10n_util.h"
131 #include "ui/base/resource/resource_bundle.h" 131 #include "ui/base/resource/resource_bundle.h"
132 #include "ui/message_center/message_center_util.h" 132 #include "ui/message_center/message_center_util.h"
133 #include "webkit/glue/webpreferences.h" 133 #include "webkit/common/webpreferences.h"
134 #include "webkit/plugins/plugin_switches.h" 134 #include "webkit/plugins/plugin_switches.h"
135 135
136 #if defined(OS_WIN) 136 #if defined(OS_WIN)
137 #include "chrome/browser/chrome_browser_main_win.h" 137 #include "chrome/browser/chrome_browser_main_win.h"
138 #include "sandbox/win/src/sandbox_policy.h" 138 #include "sandbox/win/src/sandbox_policy.h"
139 #elif defined(OS_MACOSX) 139 #elif defined(OS_MACOSX)
140 #include "chrome/browser/chrome_browser_main_mac.h" 140 #include "chrome/browser/chrome_browser_main_mac.h"
141 #include "chrome/browser/spellchecker/spellcheck_message_filter_mac.h" 141 #include "chrome/browser/spellchecker/spellcheck_message_filter_mac.h"
142 #elif defined(OS_CHROMEOS) 142 #elif defined(OS_CHROMEOS)
143 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h" 143 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h"
(...skipping 2131 matching lines...) Expand 10 before | Expand all | Expand 10 after
2275 #if defined(USE_NSS) 2275 #if defined(USE_NSS)
2276 crypto::CryptoModuleBlockingPasswordDelegate* 2276 crypto::CryptoModuleBlockingPasswordDelegate*
2277 ChromeContentBrowserClient::GetCryptoPasswordDelegate( 2277 ChromeContentBrowserClient::GetCryptoPasswordDelegate(
2278 const GURL& url) { 2278 const GURL& url) {
2279 return chrome::NewCryptoModuleBlockingDialogDelegate( 2279 return chrome::NewCryptoModuleBlockingDialogDelegate(
2280 chrome::kCryptoModulePasswordKeygen, url.host()); 2280 chrome::kCryptoModulePasswordKeygen, url.host());
2281 } 2281 }
2282 #endif 2282 #endif
2283 2283
2284 } // namespace chrome 2284 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698