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

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

Issue 11229022: Move ash/system/web_notification message_center to ui/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase again. Created 8 years, 1 month 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
OLDNEW
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_view_ash.h" 5 #include "chrome/browser/ui/views/ash/balloon_view_ash.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/system/web_notification/message_center.h"
9 #include "ash/system/web_notification/web_notification_tray.h" 8 #include "ash/system/web_notification/web_notification_tray.h"
10 #include "base/logging.h" 9 #include "base/logging.h"
11 #include "chrome/browser/extensions/extension_service.h" 10 #include "chrome/browser/extensions/extension_service.h"
12 #include "chrome/browser/favicon/favicon_util.h" 11 #include "chrome/browser/favicon/favicon_util.h"
13 #include "chrome/browser/notifications/balloon_collection.h" 12 #include "chrome/browser/notifications/balloon_collection.h"
14 #include "chrome/browser/notifications/notification.h" 13 #include "chrome/browser/notifications/notification.h"
15 #include "chrome/browser/profiles/profile.h" 14 #include "chrome/browser/profiles/profile.h"
16 #include "chrome/common/icon_messages.h" 15 #include "chrome/common/icon_messages.h"
17 #include "content/public/browser/render_process_host.h" 16 #include "content/public/browser/render_process_host.h"
18 #include "content/public/browser/render_view_host.h" 17 #include "content/public/browser/render_view_host.h"
19 #include "content/public/browser/site_instance.h" 18 #include "content/public/browser/site_instance.h"
20 #include "content/public/browser/web_contents.h" 19 #include "content/public/browser/web_contents.h"
21 #include "content/public/browser/web_contents_delegate.h" 20 #include "content/public/browser/web_contents_delegate.h"
22 #include "content/public/browser/web_contents_observer.h" 21 #include "content/public/browser/web_contents_observer.h"
23 #include "ipc/ipc_message.h" 22 #include "ipc/ipc_message.h"
24 #include "ipc/ipc_message_macros.h" 23 #include "ipc/ipc_message_macros.h"
25 #include "ui/gfx/image/image_skia.h" 24 #include "ui/gfx/image/image_skia.h"
25 #include "ui/message_center/message_center.h"
26 #include "webkit/glue/image_resource_fetcher.h" 26 #include "webkit/glue/image_resource_fetcher.h"
27 27
28 namespace { 28 namespace {
29 29
30 const int kNotificationIconImageSize = 32; 30 const int kNotificationIconImageSize = 32;
31 31
32 message_center::MessageCenter* GetMessageCenter() { 32 message_center::MessageCenter* GetMessageCenter() {
33 return ash::Shell::GetInstance()->GetWebNotificationTray()->message_center(); 33 return ash::Shell::GetInstance()->GetWebNotificationTray()->message_center();
34 } 34 }
35 35
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 ExtensionService* extension_service = 159 ExtensionService* extension_service =
160 balloon_->profile()->GetExtensionService(); 160 balloon_->profile()->GetExtensionService();
161 const GURL& origin = balloon_->notification().origin_url(); 161 const GURL& origin = balloon_->notification().origin_url();
162 const extensions::Extension* extension = 162 const extensions::Extension* extension =
163 extension_service->extensions()->GetExtensionOrAppByURL( 163 extension_service->extensions()->GetExtensionOrAppByURL(
164 ExtensionURLInfo(origin)); 164 ExtensionURLInfo(origin));
165 if (extension) 165 if (extension)
166 return extension->id(); 166 return extension->id();
167 return std::string(); 167 return std::string();
168 } 168 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/ash/balloon_collection_impl_ash.h ('k') | chrome/chrome_browser_chromeos.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698