| OLD | NEW |
| 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> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 82 const SkBitmap& image, | 82 const SkBitmap& image, |
| 83 const gfx::Point& image_offset) OVERRIDE; | 83 const gfx::Point& image_offset) OVERRIDE; |
| 84 virtual void UpdateDragCursor(WebKit::WebDragOperation operation) OVERRIDE; | 84 virtual void UpdateDragCursor(WebKit::WebDragOperation operation) OVERRIDE; |
| 85 virtual void GotFocus() OVERRIDE; | 85 virtual void GotFocus() OVERRIDE; |
| 86 virtual void TakeFocus(bool reverse) OVERRIDE; | 86 virtual void TakeFocus(bool reverse) OVERRIDE; |
| 87 | 87 |
| 88 // Overridden from aura::WindowDelegate: | 88 // Overridden from aura::WindowDelegate: |
| 89 virtual gfx::Size GetMinimumSize() const OVERRIDE; | 89 virtual gfx::Size GetMinimumSize() const OVERRIDE; |
| 90 virtual void OnBoundsChanged(const gfx::Rect& old_bounds, | 90 virtual void OnBoundsChanged(const gfx::Rect& old_bounds, |
| 91 const gfx::Rect& new_bounds) OVERRIDE; | 91 const gfx::Rect& new_bounds) OVERRIDE; |
| 92 virtual void OnFocus() OVERRIDE; | 92 virtual void OnFocus(aura::Window* old_focused_window) OVERRIDE; |
| 93 virtual void OnBlur() OVERRIDE; | 93 virtual void OnBlur() OVERRIDE; |
| 94 virtual bool OnKeyEvent(aura::KeyEvent* event) OVERRIDE; | 94 virtual bool OnKeyEvent(aura::KeyEvent* event) OVERRIDE; |
| 95 virtual gfx::NativeCursor GetCursor(const gfx::Point& point) OVERRIDE; | 95 virtual gfx::NativeCursor GetCursor(const gfx::Point& point) OVERRIDE; |
| 96 virtual int GetNonClientComponent(const gfx::Point& point) const OVERRIDE; | 96 virtual int GetNonClientComponent(const gfx::Point& point) const OVERRIDE; |
| 97 virtual bool ShouldDescendIntoChildForEventHandling( | 97 virtual bool ShouldDescendIntoChildForEventHandling( |
| 98 aura::Window* child, | 98 aura::Window* child, |
| 99 const gfx::Point& location) OVERRIDE; | 99 const gfx::Point& location) OVERRIDE; |
| 100 virtual bool OnMouseEvent(aura::MouseEvent* event) OVERRIDE; | 100 virtual bool OnMouseEvent(aura::MouseEvent* event) OVERRIDE; |
| 101 virtual ui::TouchStatus OnTouchEvent(aura::TouchEvent* event) OVERRIDE; | 101 virtual ui::TouchStatus OnTouchEvent(aura::TouchEvent* event) OVERRIDE; |
| 102 virtual ui::GestureStatus OnGestureEvent(aura::GestureEvent* event) OVERRIDE; | 102 virtual ui::GestureStatus OnGestureEvent(aura::GestureEvent* event) OVERRIDE; |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 138 // We keep track of the render view host we're dragging over. If it changes | 138 // We keep track of the render view host we're dragging over. If it changes |
| 139 // during a drag, we need to re-send the DragEnter message. WARNING: | 139 // during a drag, we need to re-send the DragEnter message. WARNING: |
| 140 // this pointer should never be dereferenced. We only use it for comparing | 140 // this pointer should never be dereferenced. We only use it for comparing |
| 141 // pointers. | 141 // pointers. |
| 142 void* current_rvh_for_drag_; | 142 void* current_rvh_for_drag_; |
| 143 | 143 |
| 144 DISALLOW_COPY_AND_ASSIGN(WebContentsViewAura); | 144 DISALLOW_COPY_AND_ASSIGN(WebContentsViewAura); |
| 145 }; | 145 }; |
| 146 | 146 |
| 147 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_ | 147 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_ |
| OLD | NEW |