chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc - Issue 25108005: linux_aura: Compile ash into chrome.

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: chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc

Issue 25108005: linux_aura: Compile ash into chrome. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Reupload to try off of ToT instead of LKGR Created 6 years, 7 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:

Index: chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc

diff --git a/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc b/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc

index 6b858b7a0fec17910e3e510e8004ffa6740770c8..6de8b94333b05898f8d6cb3d68c52730b3de8aff 100644

--- a/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc

+++ b/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc

@@ -68,6 +68,11 @@ ChromeBrowserMainExtraPartsAsh::~ChromeBrowserMainExtraPartsAsh() {

void ChromeBrowserMainExtraPartsAsh::PreProfileInit() {

if (chrome::ShouldOpenAshOnStartup()) {

chrome::OpenAsh();

+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)

+ ash::Shell::GetInstance()->CreateShelf();

+ ash::Shell::GetInstance()->ShowShelf();

+#endif

} else {

#if !defined(OS_CHROMEOS)

gfx::Screen::SetScreenTypeDelegate(new ScreenTypeDelegateWin);