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

Unified Diff: chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc

Issue 1306873006: Fix mac_views_browser=1 compile. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Sync Created 5 years, 3 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/bookmarks/bookmark_utils.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc
diff --git a/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc b/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc
index c1694fb8c8f6d7b0450e2d0d96d226b4a1220567..4eaf9e1a1b82a22bb83db336dafb981538c23b7d 100644
--- a/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc
+++ b/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc
@@ -69,7 +69,8 @@ OmniboxPopupContentsView::OmniboxPopupContentsView(
set_owned_by_client();
ui::ThemeProvider* theme = location_bar_view_->GetThemeProvider();
- top_shadow_ = theme->GetImageSkiaNamed(IDR_OMNIBOX_DROPDOWN_SHADOW_TOP);
+ if (ui::MaterialDesignController::IsModeMaterial())
+ top_shadow_ = theme->GetImageSkiaNamed(IDR_OMNIBOX_DROPDOWN_SHADOW_TOP);
sky 2015/09/03 13:20:10 member initialize this to nullptr so the value is
Evan Stade 2015/09/03 13:53:07 +tdanderson for this file I'd say you could/shoul
tdanderson 2015/09/03 14:16:28 On line 74? Sounds fine by me, would you mind maki
Evan Stade 2015/09/03 16:09:40 then again, maybe IsModeMaterial() is better becau
jackhou1 2015/09/04 00:47:18 Done.
jackhou1 2015/09/04 00:47:18 Re-arranged lines 72-76 to make it a bit clearer.
int bottom_shadow_asset = ui::MaterialDesignController::IsModeMaterial() ?
IDR_OMNIBOX_DROPDOWN_SHADOW_BOTTOM : IDR_BUBBLE_B;
bottom_shadow_ = theme->GetImageSkiaNamed(bottom_shadow_asset);
« no previous file with comments | « chrome/browser/ui/bookmarks/bookmark_utils.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698