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

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

Issue 8609010: Make DevToolsManager a singleton, remove it from ContentBrowserClient (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Reverted notification service changes, use non-leaky singleton Created 9 years, 1 month 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 | « chrome/browser/chrome_content_browser_client.h ('k') | chrome/browser/ui/browser.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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 <vector> 8 #include <vector>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 990 matching lines...) Expand 10 before | Expand all | Expand 10 after
1001 1001
1002 ui::Clipboard* ChromeContentBrowserClient::GetClipboard() { 1002 ui::Clipboard* ChromeContentBrowserClient::GetClipboard() {
1003 return g_browser_process->clipboard(); 1003 return g_browser_process->clipboard();
1004 } 1004 }
1005 1005
1006 MHTMLGenerationManager* 1006 MHTMLGenerationManager*
1007 ChromeContentBrowserClient::GetMHTMLGenerationManager() { 1007 ChromeContentBrowserClient::GetMHTMLGenerationManager() {
1008 return g_browser_process->mhtml_generation_manager(); 1008 return g_browser_process->mhtml_generation_manager();
1009 } 1009 }
1010 1010
1011 DevToolsManager* ChromeContentBrowserClient::GetDevToolsManager() {
1012 return g_browser_process->devtools_manager();
1013 }
1014
1015 net::NetLog* ChromeContentBrowserClient::GetNetLog() { 1011 net::NetLog* ChromeContentBrowserClient::GetNetLog() {
1016 return g_browser_process->net_log(); 1012 return g_browser_process->net_log();
1017 } 1013 }
1018 1014
1019 speech_input::SpeechInputManager* 1015 speech_input::SpeechInputManager*
1020 ChromeContentBrowserClient::GetSpeechInputManager() { 1016 ChromeContentBrowserClient::GetSpeechInputManager() {
1021 return speech_input::ChromeSpeechInputManager::GetInstance(); 1017 return speech_input::ChromeSpeechInputManager::GetInstance();
1022 } 1018 }
1023 1019
1024 AccessTokenStore* ChromeContentBrowserClient::CreateAccessTokenStore() { 1020 AccessTokenStore* ChromeContentBrowserClient::CreateAccessTokenStore() {
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
1127 #if defined(USE_NSS) 1123 #if defined(USE_NSS)
1128 crypto::CryptoModuleBlockingPasswordDelegate* 1124 crypto::CryptoModuleBlockingPasswordDelegate*
1129 ChromeContentBrowserClient::GetCryptoPasswordDelegate( 1125 ChromeContentBrowserClient::GetCryptoPasswordDelegate(
1130 const GURL& url) { 1126 const GURL& url) {
1131 return browser::NewCryptoModuleBlockingDialogDelegate( 1127 return browser::NewCryptoModuleBlockingDialogDelegate(
1132 browser::kCryptoModulePasswordKeygen, url.host()); 1128 browser::kCryptoModulePasswordKeygen, url.host());
1133 } 1129 }
1134 #endif 1130 #endif
1135 1131
1136 } // namespace chrome 1132 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/chrome_content_browser_client.h ('k') | chrome/browser/ui/browser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698