| 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 | 7 |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/memory/ref_counted.h" | 10 #include "base/memory/ref_counted.h" |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 73 virtual void ShowPopupMenu(const gfx::Rect& bounds, | 73 virtual void ShowPopupMenu(const gfx::Rect& bounds, |
| 74 int item_height, | 74 int item_height, |
| 75 double item_font_size, | 75 double item_font_size, |
| 76 int selected_item, | 76 int selected_item, |
| 77 const std::vector<WebMenuItem>& items, | 77 const std::vector<WebMenuItem>& items, |
| 78 bool right_aligned, | 78 bool right_aligned, |
| 79 bool allow_multiple_selection) OVERRIDE; | 79 bool allow_multiple_selection) OVERRIDE; |
| 80 virtual void StartDragging(const WebDropData& drop_data, | 80 virtual void StartDragging(const WebDropData& drop_data, |
| 81 WebKit::WebDragOperationsMask operations, | 81 WebKit::WebDragOperationsMask operations, |
| 82 const gfx::ImageSkia& image, | 82 const gfx::ImageSkia& image, |
| 83 const gfx::Point& image_offset) OVERRIDE; | 83 const gfx::Vector2d& 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(aura::Window* old_focused_window) OVERRIDE; | 92 virtual void OnFocus(aura::Window* old_focused_window) OVERRIDE; |
| 93 virtual void OnBlur() OVERRIDE; | 93 virtual void OnBlur() OVERRIDE; |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 137 // 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 |
| 138 // pointers. | 138 // pointers. |
| 139 void* current_rvh_for_drag_; | 139 void* current_rvh_for_drag_; |
| 140 | 140 |
| 141 DISALLOW_COPY_AND_ASSIGN(WebContentsViewAura); | 141 DISALLOW_COPY_AND_ASSIGN(WebContentsViewAura); |
| 142 }; | 142 }; |
| 143 | 143 |
| 144 } // namespace content | 144 } // namespace content |
| 145 | 145 |
| 146 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_ | 146 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_ |
| OLD | NEW |