ash/shell/content_client/shell_browser_main_parts.cc - Issue 138223004: Inject GPUDataManager support into ash to abstract a content dependency.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 138223004: Inject GPUDataManager support into ash to abstract a content dependency. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: . 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

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 2e4a4c402003948724da9850239a43e095e9252a..9d088b5b4cf3836b2f0c4b3739284bfad22bdacc 100644

--- a/ash/shell/content_client/shell_browser_main_parts.cc

+++ b/ash/shell/content_client/shell_browser_main_parts.cc

@@ -5,6 +5,7 @@

#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"

@@ -123,6 +124,7 @@ 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/system/monitor/tray_monitor.cc » ('j') | no next file with comments »