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

Unified Diff: chrome/browser/ui/views/notifications/balloon_view_host.cc

Issue 8632001: Removed TOUCH_UI (mostly constants) from chrome/browser/ui/views. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/notifications/balloon_view_host.cc
diff --git a/chrome/browser/ui/views/notifications/balloon_view_host.cc b/chrome/browser/ui/views/notifications/balloon_view_host.cc
index 0b88a11870887089d23886d981ed09d4a2ef970d..aebef329d8a611cae1a0a5d76fccccbb18b91a91 100644
--- a/chrome/browser/ui/views/notifications/balloon_view_host.cc
+++ b/chrome/browser/ui/views/notifications/balloon_view_host.cc
@@ -11,10 +11,6 @@
#include "content/public/browser/content_browser_client.h"
#include "ui/views/widget/widget.h"
-#if defined(TOUCH_UI) && !defined(USE_AURA)
-#include "chrome/browser/renderer_host/render_widget_host_view_views.h"
-#endif
-
class BalloonViewHostView : public views::NativeViewHost {
public:
explicit BalloonViewHostView(BalloonViewHost* host)
@@ -54,11 +50,6 @@ void BalloonViewHost::Init(gfx::NativeView parent_native_view) {
RenderWidgetHostView* render_widget_host_view =
tab_contents_->render_view_host()->view();
-#if defined(TOUCH_UI) && !defined(USE_AURA)
- RenderWidgetHostViewViews* view_views =
- static_cast<RenderWidgetHostViewViews*>(render_widget_host_view);
- native_host_->AttachToView(view_views);
-#else
+
native_host_->Attach(render_widget_host_view->GetNativeView());
-#endif
}
« no previous file with comments | « chrome/browser/ui/views/location_bar/location_bar_view.cc ('k') | chrome/browser/ui/views/omnibox/omnibox_view_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698