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

Unified Diff: ash/shell/content_client/shell_browser_main_parts.cc

Issue 132173006: Provide real GPUSupport to ash for Chrome (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix win (gpu_support) Created 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/shell.cc ('k') | ash/shell/shell_delegate_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell/content_client/shell_browser_main_parts.cc
diff --git a/ash/shell/content_client/shell_browser_main_parts.cc b/ash/shell/content_client/shell_browser_main_parts.cc
index 9d088b5b4cf3836b2f0c4b3739284bfad22bdacc..2e4a4c402003948724da9850239a43e095e9252a 100644
--- a/ash/shell/content_client/shell_browser_main_parts.cc
+++ b/ash/shell/content_client/shell_browser_main_parts.cc
@@ -5,7 +5,6 @@
#include "ash/shell/content_client/shell_browser_main_parts.h"
#include "ash/ash_switches.h"
-#include "ash/content_support/inject.h"
#include "ash/desktop_background/desktop_background_controller.h"
#include "ash/shell.h"
#include "ash/shell/shell_delegate_impl.h"
@@ -124,7 +123,6 @@ void ShellBrowserMainParts::PreMainMessageLoopRun() {
#endif
ash::Shell::CreateInstance(delegate_);
- ash::InitContentSupport();
delegate_->set_browser_context(browser_context_.get());
ash::Shell::GetInstance()->CreateShelf();
ash::Shell::GetInstance()->UpdateAfterLoginStatusChange(
« no previous file with comments | « ash/shell.cc ('k') | ash/shell/shell_delegate_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698