chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views_unittest.cc - Issue 489763002: MacViews: Gets a webview working in views_examples_with_content_exe

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_unittest.cc

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

« no previous file with comments | « chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views_mac.mm ('k') | chrome/chrome_browser_ui.gypi » ('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_unittest.cc

diff --git a/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views_unittest.cc b/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views_unittest.cc

index d69f48af75b3690774c97ab4e1133b764a89fb9d..54a1970e5091adb23688ce68e6d7db2b07ae7bd8 100644

--- a/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views_unittest.cc

+++ b/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views_unittest.cc

@@ -4,24 +4,18 @@

#include "chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.h"

+#include "chrome/browser/ui/tab_contents/chrome_web_contents_view_delegate.h"

#include "chrome/test/base/chrome_render_view_host_test_harness.h"

#include "content/public/browser/web_contents.h"

#include "content/public/common/context_menu_params.h"

-class ChromeWebContentsViewDelegateViewsTest

- : public ChromeRenderViewHostTestHarness {

- public:

- ChromeWebContentsViewDelegateViewsTest() {}

- private:

- DISALLOW_COPY_AND_ASSIGN(ChromeWebContentsViewDelegateViewsTest);

-};

+typedef ChromeRenderViewHostTestHarness ChromeWebContentsViewDelegateViewsTest;

// Test that makes sure ShowContextMenu does not crash if web_contents() does

// not have a focused frame.

TEST_F(ChromeWebContentsViewDelegateViewsTest, ContextMenuNoFocusedFrame) {

- scoped_ptr<ChromeWebContentsViewDelegateViews> delegate_view(

- new ChromeWebContentsViewDelegateViews(web_contents()));

+ scoped_ptr<content::WebContentsViewDelegate> delegate_view(

+ chrome::CreateWebContentsViewDelegate(web_contents(), NULL));

EXPECT_FALSE(web_contents()->GetFocusedFrame());

const content::ContextMenuParams params;

delegate_view->ShowContextMenu(web_contents()->GetMainFrame(), params);