| Index: chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.h
|
| diff --git a/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.h b/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.h
|
| index b7170b3a8fc7dd697e3c650a8ced4f184ed75a9e..a851356cd24b1bc5b147ae7b2d74497faef8058d 100644
|
| --- a/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.h
|
| +++ b/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.h
|
| @@ -10,6 +10,7 @@
|
| #include "base/memory/scoped_ptr.h"
|
| #include "components/renderer_context_menu/context_menu_delegate.h"
|
| #include "content/public/browser/web_contents_view_delegate.h"
|
| +#include "ui/gfx/native_widget_types.h"
|
|
|
| class RenderViewContextMenu;
|
| class RenderViewContextMenuViews;
|
| @@ -41,10 +42,10 @@ class ChromeWebContentsViewDelegateViews
|
|
|
| // Overridden from WebContentsViewDelegate:
|
| virtual content::WebDragDestDelegate* GetDragDestDelegate() OVERRIDE;
|
| - virtual void StoreFocus() OVERRIDE;
|
| - virtual void RestoreFocus() OVERRIDE;
|
| + virtual bool StoreFocus() OVERRIDE;
|
| + virtual bool RestoreFocus() OVERRIDE;
|
| virtual bool Focus() OVERRIDE;
|
| - virtual void TakeFocus(bool reverse) OVERRIDE;
|
| + virtual bool TakeFocus(bool reverse) OVERRIDE;
|
| virtual void ShowContextMenu(
|
| content::RenderFrameHost* render_frame_host,
|
| const content::ContextMenuParams& params) OVERRIDE;
|
| @@ -57,7 +58,7 @@ class ChromeWebContentsViewDelegateViews
|
| virtual void ShowMenu(scoped_ptr<RenderViewContextMenu> menu) OVERRIDE;
|
|
|
| private:
|
| - aura::Window* GetActiveNativeView();
|
| + gfx::NativeView GetActiveNativeView();
|
| views::Widget* GetTopLevelWidget();
|
| views::FocusManager* GetFocusManager();
|
| void SetInitialFocus();
|
|
|