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 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
109 | 109 |
110 // Overridden from WebContentsViewPort: | 110 // Overridden from WebContentsViewPort: |
111 virtual void CreateView( | 111 virtual void CreateView( |
112 const gfx::Size& initial_size, gfx::NativeView context) OVERRIDE; | 112 const gfx::Size& initial_size, gfx::NativeView context) OVERRIDE; |
113 virtual RenderWidgetHostView* CreateViewForWidget( | 113 virtual RenderWidgetHostView* CreateViewForWidget( |
114 RenderWidgetHost* render_widget_host) OVERRIDE; | 114 RenderWidgetHost* render_widget_host) OVERRIDE; |
115 virtual RenderWidgetHostView* CreateViewForPopupWidget( | 115 virtual RenderWidgetHostView* CreateViewForPopupWidget( |
116 RenderWidgetHost* render_widget_host) OVERRIDE; | 116 RenderWidgetHost* render_widget_host) OVERRIDE; |
117 virtual void SetPageTitle(const string16& title) OVERRIDE; | 117 virtual void SetPageTitle(const string16& title) OVERRIDE; |
118 virtual void RenderViewCreated(RenderViewHost* host) OVERRIDE; | 118 virtual void RenderViewCreated(RenderViewHost* host) OVERRIDE; |
119 virtual void RenderViewSwappedIn(RenderViewHost* host) OVERRIDE; | 119 virtual void RenderViewSwappedIn(RenderViewHost* new_host, |
| 120 RenderViewHost* old_host) OVERRIDE; |
120 | 121 |
121 // Overridden from RenderViewHostDelegateView: | 122 // Overridden from RenderViewHostDelegateView: |
122 virtual void ShowContextMenu( | 123 virtual void ShowContextMenu( |
123 const ContextMenuParams& params, | 124 const ContextMenuParams& params, |
124 ContextMenuSourceType type) OVERRIDE; | 125 ContextMenuSourceType type) OVERRIDE; |
125 virtual void ShowPopupMenu(const gfx::Rect& bounds, | 126 virtual void ShowPopupMenu(const gfx::Rect& bounds, |
126 int item_height, | 127 int item_height, |
127 double item_font_size, | 128 double item_font_size, |
128 int selected_item, | 129 int selected_item, |
129 const std::vector<WebMenuItem>& items, | 130 const std::vector<WebMenuItem>& items, |
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
222 // This manages the overlay window that shows the screenshot during a history | 223 // This manages the overlay window that shows the screenshot during a history |
223 // navigation triggered by the overscroll gesture. | 224 // navigation triggered by the overscroll gesture. |
224 scoped_ptr<OverscrollNavigationOverlay> navigation_overlay_; | 225 scoped_ptr<OverscrollNavigationOverlay> navigation_overlay_; |
225 | 226 |
226 DISALLOW_COPY_AND_ASSIGN(WebContentsViewAura); | 227 DISALLOW_COPY_AND_ASSIGN(WebContentsViewAura); |
227 }; | 228 }; |
228 | 229 |
229 } // namespace content | 230 } // namespace content |
230 | 231 |
231 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_ | 232 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_AURA_H_ |
OLD | NEW |