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

Side by Side Diff: chrome/browser/ui/views/notifications/balloon_view_host.cc

Issue 8355042: aura: Use the existing notification system. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: comment Created 9 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
« no previous file with comments | « chrome/browser/notifications/balloon_collection_views.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/notifications/balloon_view_host.h" 5 #include "chrome/browser/ui/views/notifications/balloon_view_host.h"
6 6
7 #include "chrome/browser/notifications/balloon.h" 7 #include "chrome/browser/notifications/balloon.h"
8 #include "content/browser/renderer_host/render_view_host.h" 8 #include "content/browser/renderer_host/render_view_host.h"
9 #include "content/browser/renderer_host/render_widget_host_view.h" 9 #include "content/browser/renderer_host/render_widget_host_view.h"
10 #if defined(OS_WIN)
11 #include "content/browser/renderer_host/render_widget_host_view_win.h"
12 #endif
13 #if defined(TOOLKIT_USES_GTK)
14 #if defined(TOUCH_UI) || defined(USE_AURA)
15 #include "chrome/browser/renderer_host/render_widget_host_view_views.h"
16 #else
17 #include "content/browser/renderer_host/render_widget_host_view_gtk.h"
18 #endif
19 #endif
20 #include "content/public/browser/content_browser_client.h" 10 #include "content/public/browser/content_browser_client.h"
21 #include "views/widget/widget.h" 11 #include "views/widget/widget.h"
22 12
13 #if defined(USE_AURA)
14 #include "content/browser/renderer_host/render_widget_host_view_aura.h"
15 #elif defined(OS_WIN)
16 #include "content/browser/renderer_host/render_widget_host_view_win.h"
17 #elif defined(TOUCH_UI)
18 #include "chrome/browser/renderer_host/render_widget_host_view_views.h"
19 #elif defined(TOOLKIT_USES_GTK)
20 #include "content/browser/renderer_host/render_widget_host_view_gtk.h"
21 #endif
22
23 class BalloonViewHostView : public views::NativeViewHost { 23 class BalloonViewHostView : public views::NativeViewHost {
24 public: 24 public:
25 explicit BalloonViewHostView(BalloonViewHost* host) 25 explicit BalloonViewHostView(BalloonViewHost* host)
26 : host_(host), 26 : host_(host),
27 initialized_(false) { 27 initialized_(false) {
28 } 28 }
29 29
30 virtual void ViewHierarchyChanged(bool is_add, 30 virtual void ViewHierarchyChanged(bool is_add,
31 views::View* parent, 31 views::View* parent,
32 views::View* child) { 32 views::View* child) {
(...skipping 27 matching lines...) Expand all
60 60
61 void BalloonViewHost::InitRenderWidgetHostView() { 61 void BalloonViewHost::InitRenderWidgetHostView() {
62 DCHECK(render_view_host_); 62 DCHECK(render_view_host_);
63 63
64 render_widget_host_view_ = 64 render_widget_host_view_ =
65 content::GetContentClient()->browser()->CreateViewForWidget( 65 content::GetContentClient()->browser()->CreateViewForWidget(
66 render_view_host_); 66 render_view_host_);
67 67
68 // TODO(johnnyg): http://crbug.com/23954. Need a cross-platform solution. 68 // TODO(johnnyg): http://crbug.com/23954. Need a cross-platform solution.
69 #if defined(USE_AURA) 69 #if defined(USE_AURA)
70 // TODO(beng): (same as touch_ui probably). 70 RenderWidgetHostViewAura* view_aura =
71 NOTIMPLEMENTED(); 71 static_cast<RenderWidgetHostViewAura*>(render_widget_host_view_);
72 view_aura->Init();
73 view_aura->Show();
74 native_host_->Attach(view_aura->GetNativeView());
72 #elif defined(OS_WIN) 75 #elif defined(OS_WIN)
73 RenderWidgetHostViewWin* view_win = 76 RenderWidgetHostViewWin* view_win =
74 static_cast<RenderWidgetHostViewWin*>(render_widget_host_view_); 77 static_cast<RenderWidgetHostViewWin*>(render_widget_host_view_);
75 78
76 // Create the HWND. 79 // Create the HWND.
77 HWND hwnd = view_win->Create(parent_native_view_); 80 HWND hwnd = view_win->Create(parent_native_view_);
78 view_win->ShowWindow(SW_SHOW); 81 view_win->ShowWindow(SW_SHOW);
79 native_host_->Attach(hwnd); 82 native_host_->Attach(hwnd);
80 #elif defined(TOOLKIT_USES_GTK) 83 #elif defined(TOUCH_UI)
81 #if defined(TOUCH_UI)
82 RenderWidgetHostViewViews* view_views = 84 RenderWidgetHostViewViews* view_views =
83 static_cast<RenderWidgetHostViewViews*>(render_widget_host_view_); 85 static_cast<RenderWidgetHostViewViews*>(render_widget_host_view_);
84 view_views->InitAsChild(); 86 view_views->InitAsChild();
85 native_host_->AttachToView(view_views); 87 native_host_->AttachToView(view_views);
86 #else 88 #elif defined(TOOLKIT_USES_GTK)
87 RenderWidgetHostViewGtk* view_gtk = 89 RenderWidgetHostViewGtk* view_gtk =
88 static_cast<RenderWidgetHostViewGtk*>(render_widget_host_view_); 90 static_cast<RenderWidgetHostViewGtk*>(render_widget_host_view_);
89 view_gtk->InitAsChild(); 91 view_gtk->InitAsChild();
90 native_host_->Attach(view_gtk->native_view()); 92 native_host_->Attach(view_gtk->native_view());
91 #endif
92 #else 93 #else
93 NOTIMPLEMENTED(); 94 NOTIMPLEMENTED();
94 #endif 95 #endif
95 } 96 }
96 97
97 RenderWidgetHostView* BalloonViewHost::render_widget_host_view() const { 98 RenderWidgetHostView* BalloonViewHost::render_widget_host_view() const {
98 return render_widget_host_view_; 99 return render_widget_host_view_;
99 } 100 }
OLDNEW
« no previous file with comments | « chrome/browser/notifications/balloon_collection_views.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698