chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.h - Issue 659233002: STASH: Epic Experimental patch for toolkit-views App List on Mac

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 659233002: STASH: Epic Experimental patch for toolkit-views App List on Mac Base URL: https://chromium.googlesource.com/chromium/src.git/+/master

Patch Set: Fix a few things. Works@master Created 6 years, 2 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

« no previous file with comments | « chrome/browser/ui/views/chrome_views_delegate.cc ('k') | chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 899956edfe26c18cf27a73c737a41580de6483f5..8a2c8cd576a8c8b17d5f1c6e1d28d90c317ccfae 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 LinkDisambiguationPopup;

class RenderViewContextMenu;

@@ -42,10 +43,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;

@@ -65,7 +66,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();