chrome/browser/extensions/extension_infobar_delegate.cc - 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/extensions/extension_infobar_delegate.cc

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

Index: chrome/browser/extensions/extension_infobar_delegate.cc

diff --git a/chrome/browser/extensions/extension_infobar_delegate.cc b/chrome/browser/extensions/extension_infobar_delegate.cc

index ba169600b5184f53265edb06f9aec89053285566..52050b6ca2e45e22fb80ce83ff65c693fef73d74 100644

--- a/chrome/browser/extensions/extension_infobar_delegate.cc

+++ b/chrome/browser/extensions/extension_infobar_delegate.cc

@@ -10,6 +10,7 @@

#include "chrome/browser/infobars/infobar_service.h"

#include "chrome/browser/profiles/profile.h"

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

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

#include "components/infobars/core/infobar.h"

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

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

@@ -55,9 +56,10 @@ ExtensionInfoBarDelegate::ExtensionInfoBarDelegate(

content::Source<Profile>(browser->profile()));

height_ = std::max(0, height);

- height_ = std::min(2 * infobars::InfoBar::kDefaultBarTargetHeight, height_);

+ height_ =

+ std::min(2 * InfoBarContainerDelegate::kDefaultBarTargetHeight, height_);

if (height_ == 0)

- height_ = infobars::InfoBar::kDefaultBarTargetHeight;

+ height_ = InfoBarContainerDelegate::kDefaultBarTargetHeight;

}

content::WebContents* ExtensionInfoBarDelegate::GetWebContents() {

« no previous file with comments | « no previous file | chrome/browser/ui/cocoa/browser_window_controller_browsertest.mm » ('j') | chrome/browser/ui/infobar_container_delegate.cc » ('J')