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

Unified Diff: chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.h

Issue 489763002: MacViews: Gets a webview working in views_examples_with_content_exe Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase to master Created 6 years, 4 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 side-by-side diff with in-line comments
Download patch
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();

Powered by Google App Engine
This is Rietveld 408576698