Fix mac_views_browser=1 compile.

chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.h"
 
 #include <algorithm>
 
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/themes/theme_properties.h"
@@ skipping 51 matching lines @@
       location_bar_view_(location_bar_view),
       font_list_(font_list),
       ignore_mouse_drag_(false),
       size_animation_(this),
       start_margin_(0),
       end_margin_(0) {
   // The contents is owned by the LocationBarView.
   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 initialized always.

[Evan Stade, 2015/09/03 13:53:07]

+tdanderson for this file

I'd say you could/should change conditionals below from IsModeMaterial() to if
(top_shadow_)

[tdanderson, 2015/09/03 14:16:28]

On line 74? Sounds fine by me, would you mind making that change in this CL?

[Evan Stade, 2015/09/03 16:09:40]

then again, maybe IsModeMaterial() is better because it makes it easier to find
the places we need to clean up when IsModeMaterial() is always true? shrug

[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. I haven't changed other uses
of IsModeMaterial() in this file because it's somewhat out of the scope of this
CL. Also, as you say, it'll make it easier to find dead code later.

   int bottom_shadow_asset = ui::MaterialDesignController::IsModeMaterial() ?
       IDR_OMNIBOX_DROPDOWN_SHADOW_BOTTOM : IDR_BUBBLE_B;
   bottom_shadow_ = theme->GetImageSkiaNamed(bottom_shadow_asset);
 
   SetEventTargeter(
       scoped_ptr<views::ViewTargeter>(new views::ViewTargeter(this)));
 }
 
 void OmniboxPopupContentsView::Init() {
   // This can't be done in the constructor as at that point we aren't
@@ skipping 454 matching lines @@
   size_t index = GetIndexForPoint(event.location());
   if (!HasMatchAt(index))
     return;
   omnibox_view_->OpenMatch(model_->result().match_at(index), disposition,
                            GURL(), base::string16(), index);
 }
 
 OmniboxResultView* OmniboxPopupContentsView::result_view_at(size_t i) {
   return static_cast<OmniboxResultView*>(child_at(static_cast<int>(i)));
 }