Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1037)

Unified Diff: chrome/browser/extensions/extension_infobar_delegate.cc

Issue 9433044: Fix extensions compile issues for Android on sync_unit_tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Tracked issue for default_height in a bug and put bug # here. Created 8 years, 10 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
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 e5ad10b3a0e34b5251b923e28249afdda045c092..ddbee6b9336e3a3ff2536eb5c682f3e6e0d60dd4 100644
--- a/chrome/browser/extensions/extension_infobar_delegate.cc
+++ b/chrome/browser/extensions/extension_infobar_delegate.cc
@@ -42,6 +42,10 @@ ExtensionInfoBarDelegate::ExtensionInfoBarDelegate(
// TODO(pkasting): Once Infobars have been ported to Mac, we can remove the
// ifdefs and just use the Infobar constant below.
int default_height = 36;
+#elif defined(OS_ANDROID)
+ // TODO(dtrainor): This is not used. Might need to pull this from Android UI
+ // level in the future. Tracked via issue 115303.
+ int default_height = 36;
#endif
height_ = std::max(0, height);
height_ = std::min(2 * default_height, height_);

Powered by Google App Engine
This is Rietveld 408576698