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

Side by Side Diff: content/browser/web_contents/web_contents_view_aura.h

Issue 10566009: app_list: Fix shadow bleeds over launcher button and steals mouse events (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix aura_demo compilation Created 8 years, 6 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
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 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_ 5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_
6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_ 6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_
7 #pragma once 7 #pragma once
8 8
9 #include <vector>
10
9 #include "base/memory/ref_counted.h" 11 #include "base/memory/ref_counted.h"
10 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
11 #include "content/common/content_export.h" 13 #include "content/common/content_export.h"
12 #include "content/port/browser/render_view_host_delegate_view.h" 14 #include "content/port/browser/render_view_host_delegate_view.h"
13 #include "content/public/browser/web_contents_view.h" 15 #include "content/public/browser/web_contents_view.h"
14 #include "ui/aura/client/drag_drop_delegate.h" 16 #include "ui/aura/client/drag_drop_delegate.h"
15 #include "ui/aura/window_delegate.h" 17 #include "ui/aura/window_delegate.h"
16 18
17 class WebContentsImpl; 19 class WebContentsImpl;
18 20
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 virtual bool OnMouseEvent(aura::MouseEvent* event) OVERRIDE; 97 virtual bool OnMouseEvent(aura::MouseEvent* event) OVERRIDE;
96 virtual ui::TouchStatus OnTouchEvent(aura::TouchEvent* event) OVERRIDE; 98 virtual ui::TouchStatus OnTouchEvent(aura::TouchEvent* event) OVERRIDE;
97 virtual ui::GestureStatus OnGestureEvent(aura::GestureEvent* event) OVERRIDE; 99 virtual ui::GestureStatus OnGestureEvent(aura::GestureEvent* event) OVERRIDE;
98 virtual bool CanFocus() OVERRIDE; 100 virtual bool CanFocus() OVERRIDE;
99 virtual void OnCaptureLost() OVERRIDE; 101 virtual void OnCaptureLost() OVERRIDE;
100 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; 102 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
101 virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE; 103 virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE;
102 virtual void OnWindowDestroying() OVERRIDE; 104 virtual void OnWindowDestroying() OVERRIDE;
103 virtual void OnWindowDestroyed() OVERRIDE; 105 virtual void OnWindowDestroyed() OVERRIDE;
104 virtual void OnWindowVisibilityChanged(bool visible) OVERRIDE; 106 virtual void OnWindowVisibilityChanged(bool visible) OVERRIDE;
107 virtual bool HasHitTestMask() const OVERRIDE;
108 virtual void GetHitTestMask(gfx::Path* mask) const OVERRIDE;
105 109
106 // Overridden from aura::client::DragDropDelegate: 110 // Overridden from aura::client::DragDropDelegate:
107 virtual void OnDragEntered(const aura::DropTargetEvent& event) OVERRIDE; 111 virtual void OnDragEntered(const aura::DropTargetEvent& event) OVERRIDE;
108 virtual int OnDragUpdated(const aura::DropTargetEvent& event) OVERRIDE; 112 virtual int OnDragUpdated(const aura::DropTargetEvent& event) OVERRIDE;
109 virtual void OnDragExited() OVERRIDE; 113 virtual void OnDragExited() OVERRIDE;
110 virtual int OnPerformDrop(const aura::DropTargetEvent& event) OVERRIDE; 114 virtual int OnPerformDrop(const aura::DropTargetEvent& event) OVERRIDE;
111 115
112 gfx::Size initial_size_; 116 gfx::Size initial_size_;
113 117
114 scoped_ptr<aura::Window> window_; 118 scoped_ptr<aura::Window> window_;
(...skipping 16 matching lines...) Expand all
131 // We keep track of the render view host we're dragging over. If it changes 135 // We keep track of the render view host we're dragging over. If it changes
132 // during a drag, we need to re-send the DragEnter message. WARNING: 136 // during a drag, we need to re-send the DragEnter message. WARNING:
133 // this pointer should never be dereferenced. We only use it for comparing 137 // this pointer should never be dereferenced. We only use it for comparing
134 // pointers. 138 // pointers.
135 void* current_rvh_for_drag_; 139 void* current_rvh_for_drag_;
136 140
137 DISALLOW_COPY_AND_ASSIGN(WebContentsViewAura); 141 DISALLOW_COPY_AND_ASSIGN(WebContentsViewAura);
138 }; 142 };
139 143
140 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_ 144 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_
OLDNEW
« no previous file with comments | « content/browser/renderer_host/render_widget_host_view_aura.cc ('k') | content/browser/web_contents/web_contents_view_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698