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

Side by Side Diff: content/shell/shell_content_browser_client.cc

Issue 9150016: Move creation and ownership of ResourceDispatcherHost and PluginService to content. This gives a ... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix chromeos ui_tests Created 8 years, 11 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) 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 227 matching lines...) Expand 10 before | Expand all | Expand 10 after
238 const content::ResourceContext& context, 238 const content::ResourceContext& context,
239 int render_process_id) { 239 int render_process_id) {
240 return true; 240 return true;
241 } 241 }
242 242
243 std::string ShellContentBrowserClient::GetWorkerProcessTitle( 243 std::string ShellContentBrowserClient::GetWorkerProcessTitle(
244 const GURL& url, const content::ResourceContext& context) { 244 const GURL& url, const content::ResourceContext& context) {
245 return std::string(); 245 return std::string();
246 } 246 }
247 247
248 ResourceDispatcherHost* ShellContentBrowserClient::GetResourceDispatcherHost() { 248 void ShellContentBrowserClient::ResourceDispatcherHostCreated() {
249 return shell_browser_main_parts_->GetResourceDispatcherHost();
250 } 249 }
251 250
252 ui::Clipboard* ShellContentBrowserClient::GetClipboard() { 251 ui::Clipboard* ShellContentBrowserClient::GetClipboard() {
253 return shell_browser_main_parts_->GetClipboard(); 252 return shell_browser_main_parts_->GetClipboard();
254 } 253 }
255 254
256 MHTMLGenerationManager* ShellContentBrowserClient::GetMHTMLGenerationManager() { 255 MHTMLGenerationManager* ShellContentBrowserClient::GetMHTMLGenerationManager() {
257 return NULL; 256 return NULL;
258 } 257 }
259 258
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
332 tab_contents_view->tab_contents()->GetBrowserContext(), 331 tab_contents_view->tab_contents()->GetBrowserContext(),
333 GURL(), 332 GURL(),
334 tab_contents_view->tab_contents()->GetSiteInstance(), 333 tab_contents_view->tab_contents()->GetSiteInstance(),
335 route_id, 334 route_id,
336 tab_contents_view->tab_contents()); 335 tab_contents_view->tab_contents());
337 return shell->tab_contents(); 336 return shell->tab_contents();
338 } 337 }
339 #endif 338 #endif
340 339
341 } // namespace content 340 } // namespace content
OLDNEW
« chrome/browser/chrome_browser_main.cc ('K') | « 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