chrome/browser/ui/views/ash/balloon_collection_impl_ash.cc - Issue 10984025: make --desktop-aura work again on windows

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: chrome/browser/ui/views/ash/balloon_collection_impl_ash.cc

Issue 10984025: make --desktop-aura work again on windows (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: diff fix per stevenjb Created 8 years, 2 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

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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 "chrome/browser/ui/views/ash/balloon_collection_impl_ash.h"	5 #include "chrome/browser/ui/views/ash/balloon_collection_impl_ash.h"

6	6

7 #include "ash/shell.h"	7 #include "ash/shell.h"

8 #include "ash/system/status_area_widget.h"	8 #include "ash/system/status_area_widget.h"

9 #include "chrome/browser/extensions/extension_service.h"	9 #include "chrome/browser/extensions/extension_service.h"

10 #include "chrome/browser/notifications/balloon.h"	10 #include "chrome/browser/notifications/balloon.h"

(...skipping 118 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
129 Balloon* balloon) {	129 Balloon* balloon) {

130 if (!balloon)	130 if (!balloon)

131 return NULL;	131 return NULL;

132 ExtensionService* extension_service =	132 ExtensionService* extension_service =

133 balloon->profile()->GetExtensionService();	133 balloon->profile()->GetExtensionService();

134 const GURL& origin = balloon->notification().origin_url();	134 const GURL& origin = balloon->notification().origin_url();

135 return extension_service->extensions()->GetExtensionOrAppByURL(	135 return extension_service->extensions()->GetExtensionOrAppByURL(

136 ExtensionURLInfo(origin));	136 ExtensionURLInfo(origin));

137 }	137 }

138	138

	139 #if defined(OS_CHROMEOS)

139 // static	140 // static

140 BalloonCollection* BalloonCollection::Create() {	141 BalloonCollection* BalloonCollection::Create() {

141 return new BalloonCollectionImplAsh();	142 return new BalloonCollectionImplAsh();

142 }	143 }

	144 #endif

OLD	NEW

« no previous file with comments | « no previous file | chrome/browser/ui/views/notifications/balloon_collection_views.cc » ('j') | no next file with comments »