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

Side by Side Diff: content/shell/shell_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 | « content/shell/shell_content_browser_client.h ('k') | no next file » | 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 "content/shell/shell_content_browser_client.h" 5 #include "content/shell/shell_content_browser_client.h"
6 6
7 #include "base/file_path.h" 7 #include "base/file_path.h"
8 #include "content/browser/webui/empty_web_ui_factory.h" 8 #include "content/browser/webui/empty_web_ui_factory.h"
9 #include "content/shell/shell.h" 9 #include "content/shell/shell.h"
10 #include "content/shell/shell_browser_main.h" 10 #include "content/shell/shell_browser_main.h"
(...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after
257 } 257 }
258 258
259 ui::Clipboard* ShellContentBrowserClient::GetClipboard() { 259 ui::Clipboard* ShellContentBrowserClient::GetClipboard() {
260 return shell_browser_main_parts_->GetClipboard(); 260 return shell_browser_main_parts_->GetClipboard();
261 } 261 }
262 262
263 MHTMLGenerationManager* ShellContentBrowserClient::GetMHTMLGenerationManager() { 263 MHTMLGenerationManager* ShellContentBrowserClient::GetMHTMLGenerationManager() {
264 return NULL; 264 return NULL;
265 } 265 }
266 266
267 DevToolsManager* ShellContentBrowserClient::GetDevToolsManager() {
268 return NULL;
269 }
270
271 net::NetLog* ShellContentBrowserClient::GetNetLog() { 267 net::NetLog* ShellContentBrowserClient::GetNetLog() {
272 return NULL; 268 return NULL;
273 } 269 }
274 270
275 speech_input::SpeechInputManager* 271 speech_input::SpeechInputManager*
276 ShellContentBrowserClient::GetSpeechInputManager() { 272 ShellContentBrowserClient::GetSpeechInputManager() {
277 return NULL; 273 return NULL;
278 } 274 }
279 275
280 AccessTokenStore* ShellContentBrowserClient::CreateAccessTokenStore() { 276 AccessTokenStore* ShellContentBrowserClient::CreateAccessTokenStore() {
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
343 tab_contents_view->tab_contents()->browser_context(), 339 tab_contents_view->tab_contents()->browser_context(),
344 GURL(), 340 GURL(),
345 tab_contents_view->tab_contents()->GetSiteInstance(), 341 tab_contents_view->tab_contents()->GetSiteInstance(),
346 route_id, 342 route_id,
347 tab_contents_view->tab_contents()); 343 tab_contents_view->tab_contents());
348 return shell->tab_contents(); 344 return shell->tab_contents();
349 } 345 }
350 #endif 346 #endif
351 347
352 } // namespace content 348 } // namespace content
OLDNEW
« no previous file with comments | « content/shell/shell_content_browser_client.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698