chrome/browser/ui/cocoa/omnibox/omnibox_view_mac_unittest.mm - Issue 768413003: TEST ONLY - DO NOT SUBMIT - FOR TRYBOTS

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/cocoa/omnibox/omnibox_view_mac_unittest.mm

Issue 768413003: TEST ONLY - DO NOT SUBMIT - FOR TRYBOTS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix bad merge Created 5 years, 11 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:

Index: chrome/browser/ui/cocoa/omnibox/omnibox_view_mac_unittest.mm

diff --git a/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac_unittest.mm b/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac_unittest.mm

index 02a24063d12cf9eaf41fb6f625c9694698786ffd..c4fcf325581dcf06fc09cc7ae2dae4754b725246 100644

--- a/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac_unittest.mm

+++ b/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac_unittest.mm

@@ -69,7 +69,6 @@ class TestingToolbarModelDelegate : public ToolbarModelDelegate {

// Overridden from ToolbarModelDelegate:

content::WebContents* GetActiveWebContents() const override { return NULL; }

- bool InTabbedBrowser() const override { return true; }

private:

DISALLOW_COPY_AND_ASSIGN(TestingToolbarModelDelegate);

@@ -89,8 +88,6 @@ class TestingOmniboxEditController : public OmniboxEditController {

void OnChanged() override {}

void OnSetFocus() override {}

void ShowURL() override {}

- void HideURL() override {}

- void EndOriginChipAnimations(bool cancel_fade) override {}

InstantController* GetInstant() override { return NULL; }

content::WebContents* GetWebContents() override { return NULL; }

ToolbarModel* GetToolbarModel() override { return toolbar_model_; }