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

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

Issue 8423015: aura: Fix build after r108132 and r108048. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 | « no previous file | no next file » | 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 #include "content/public/browser/content_browser_client.h" 10 #include "content/public/browser/content_browser_client.h"
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 RenderWidgetHostViewAura* view_aura = 70 RenderWidgetHostViewAura* view_aura =
71 static_cast<RenderWidgetHostViewAura*>(render_widget_host_view_); 71 static_cast<RenderWidgetHostViewAura*>(render_widget_host_view_);
72 view_aura->Init(); 72 view_aura->InitAsChild();
73 view_aura->Show(); 73 view_aura->Show();
74 native_host_->Attach(view_aura->GetNativeView()); 74 native_host_->Attach(view_aura->GetNativeView());
75 #elif defined(OS_WIN) 75 #elif defined(OS_WIN)
76 RenderWidgetHostViewWin* view_win = 76 RenderWidgetHostViewWin* view_win =
77 static_cast<RenderWidgetHostViewWin*>(render_widget_host_view_); 77 static_cast<RenderWidgetHostViewWin*>(render_widget_host_view_);
78 78
79 // Create the HWND. 79 // Create the HWND.
80 HWND hwnd = view_win->Create(parent_native_view_); 80 HWND hwnd = view_win->Create(parent_native_view_);
81 view_win->ShowWindow(SW_SHOW); 81 view_win->ShowWindow(SW_SHOW);
82 native_host_->Attach(hwnd); 82 native_host_->Attach(hwnd);
83 #elif defined(TOUCH_UI) 83 #elif defined(TOUCH_UI)
84 RenderWidgetHostViewViews* view_views = 84 RenderWidgetHostViewViews* view_views =
85 static_cast<RenderWidgetHostViewViews*>(render_widget_host_view_); 85 static_cast<RenderWidgetHostViewViews*>(render_widget_host_view_);
86 view_views->InitAsChild(); 86 view_views->InitAsChild();
87 native_host_->AttachToView(view_views); 87 native_host_->AttachToView(view_views);
88 #elif defined(TOOLKIT_USES_GTK) 88 #elif defined(TOOLKIT_USES_GTK)
89 RenderWidgetHostViewGtk* view_gtk = 89 RenderWidgetHostViewGtk* view_gtk =
90 static_cast<RenderWidgetHostViewGtk*>(render_widget_host_view_); 90 static_cast<RenderWidgetHostViewGtk*>(render_widget_host_view_);
91 view_gtk->InitAsChild(); 91 view_gtk->InitAsChild();
92 native_host_->Attach(view_gtk->native_view()); 92 native_host_->Attach(view_gtk->native_view());
93 #else 93 #else
94 NOTIMPLEMENTED(); 94 NOTIMPLEMENTED();
95 #endif 95 #endif
96 } 96 }
97 97
98 RenderWidgetHostView* BalloonViewHost::render_widget_host_view() const { 98 RenderWidgetHostView* BalloonViewHost::render_widget_host_view() const {
99 return render_widget_host_view_; 99 return render_widget_host_view_;
100 } 100 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698