chrome/browser/notifications/message_center_notification_manager.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/notifications/message_center_notification_manager.cc

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

Patch Set: Fix win64 compile. Created 6 years, 8 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

« chrome/browser/fullscreen_aurax11.cc ('K') | « chrome/browser/managed_mode/managed_user_theme.cc ('k') | chrome/browser/ui/ash/app_list/app_list_service_ash.cc » ('j') | chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/notifications/message_center_notification_manager.cc

diff --git a/chrome/browser/notifications/message_center_notification_manager.cc b/chrome/browser/notifications/message_center_notification_manager.cc

index fabbe9b197041e3266ed2f317e298b21e86fa7e5..5c5fc08e1595dd83dec245fcd06302817a1a296d 100644

--- a/chrome/browser/notifications/message_center_notification_manager.cc

+++ b/chrome/browser/notifications/message_center_notification_manager.cc

@@ -77,7 +77,7 @@ MessageCenterNotificationManager::MessageCenterNotificationManager(

blockers_.push_back(new FullscreenNotificationBlocker(message_center));

#if defined(OS_WIN) || defined(OS_MACOSX) \

- || (defined(USE_AURA) && !defined(USE_ASH))

+ || (defined(OS_LINUX) && !defined(OS_CHROMEOS))

// On Windows, Linux and Mac, the notification manager owns the tray icon and

// views.Other platforms have global ownership and Create will return NULL.

tray_.reset(message_center::CreateMessageCenterTray());