chrome/browser/ui/cocoa/browser_window_controller_browsertest.mm - Issue 793783003: Move infobar constants and the code that uses them from components/ to chrome/.

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/browser_window_controller_browsertest.mm

Issue 793783003: Move infobar constants and the code that uses them from components/ to chrome/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: NULL -> nullptr Created 6 years 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/extensions/extension_infobar_delegate.cc ('k') | chrome/browser/ui/cocoa/infobars/infobar_cocoa.mm » ('j') | chrome/browser/ui/infobar_container_delegate.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/browser_window_controller_browsertest.mm

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

index 48525170d52ae7a5395d38068567b7932fa91304..317bbd80f1ddb34ac8f8fd548c0dad0c02062abb 100644

--- a/chrome/browser/ui/cocoa/browser_window_controller_browsertest.mm

+++ b/chrome/browser/ui/cocoa/browser_window_controller_browsertest.mm

@@ -34,6 +34,7 @@

#include "chrome/browser/ui/extensions/application_launch.h"

#include "chrome/browser/ui/find_bar/find_bar.h"

#include "chrome/browser/ui/find_bar/find_bar_controller.h"

+#include "chrome/browser/ui/infobar_container_delegate.h"

#include "chrome/browser/ui/tabs/tab_strip_model.h"

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

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

@@ -603,8 +604,9 @@ IN_PROC_BROWSER_TEST_F(BrowserWindowControllerTest,

EXPECT_FALSE([[controller() infoBarContainerController]

shouldSuppressTopInfoBarTip]);

- NSInteger max_tip_height = infobars::InfoBar::kMaximumArrowTargetHeight +

- infobars::InfoBar::kSeparatorLineHeight;

+ NSInteger max_tip_height =

+ InfoBarContainerDelegate::kMaximumArrowTargetHeight +

+ InfoBarContainerDelegate::kSeparatorLineHeight;

chrome::ExecuteCommand(browser(), IDC_SHOW_BOOKMARK_BAR);

WaitForBookmarkBarAnimationToFinish();