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

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

Issue 10091003: Convert flash to thunk (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 8 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 | content/browser/ppapi_plugin_process_host.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 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 #include "content/public/browser/web_contents_view.h" 88 #include "content/public/browser/web_contents_view.h"
89 #include "content/public/common/child_process_host.h" 89 #include "content/public/common/child_process_host.h"
90 #include "grit/generated_resources.h" 90 #include "grit/generated_resources.h"
91 #include "grit/ui_resources.h" 91 #include "grit/ui_resources.h"
92 #include "net/base/ssl_cert_request_info.h" 92 #include "net/base/ssl_cert_request_info.h"
93 #include "net/cookies/cookie_monster.h" 93 #include "net/cookies/cookie_monster.h"
94 #include "net/cookies/cookie_options.h" 94 #include "net/cookies/cookie_options.h"
95 #include "ui/base/l10n/l10n_util.h" 95 #include "ui/base/l10n/l10n_util.h"
96 #include "ui/base/resource/resource_bundle.h" 96 #include "ui/base/resource/resource_bundle.h"
97 #include "webkit/glue/webpreferences.h" 97 #include "webkit/glue/webpreferences.h"
98 #include "webkit/plugins/plugin_switches.h"
98 99
99 #if defined(OS_WIN) 100 #if defined(OS_WIN)
100 #include "chrome/browser/chrome_browser_main_win.h" 101 #include "chrome/browser/chrome_browser_main_win.h"
101 #elif defined(OS_MACOSX) 102 #elif defined(OS_MACOSX)
102 #include "chrome/browser/chrome_browser_main_mac.h" 103 #include "chrome/browser/chrome_browser_main_mac.h"
103 #include "chrome/browser/spellchecker/spellcheck_message_filter_mac.h" 104 #include "chrome/browser/spellchecker/spellcheck_message_filter_mac.h"
104 #include "chrome/browser/tab_contents/chrome_web_contents_view_delegate_mac.h" 105 #include "chrome/browser/tab_contents/chrome_web_contents_view_delegate_mac.h"
105 #elif defined(OS_CHROMEOS) 106 #elif defined(OS_CHROMEOS)
106 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h" 107 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h"
107 #include "chrome/browser/chromeos/login/user_manager.h" 108 #include "chrome/browser/chromeos/login/user_manager.h"
(...skipping 1520 matching lines...) Expand 10 before | Expand all | Expand 10 after
1628 #if defined(USE_NSS) 1629 #if defined(USE_NSS)
1629 crypto::CryptoModuleBlockingPasswordDelegate* 1630 crypto::CryptoModuleBlockingPasswordDelegate*
1630 ChromeContentBrowserClient::GetCryptoPasswordDelegate( 1631 ChromeContentBrowserClient::GetCryptoPasswordDelegate(
1631 const GURL& url) { 1632 const GURL& url) {
1632 return browser::NewCryptoModuleBlockingDialogDelegate( 1633 return browser::NewCryptoModuleBlockingDialogDelegate(
1633 browser::kCryptoModulePasswordKeygen, url.host()); 1634 browser::kCryptoModulePasswordKeygen, url.host());
1634 } 1635 }
1635 #endif 1636 #endif
1636 1637
1637 } // namespace chrome 1638 } // namespace chrome
OLDNEW
« no previous file with comments | « no previous file | content/browser/ppapi_plugin_process_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698