Fix mac_views_browser=1 compile.

Fix mac_views_browser=1 compile.

Guard Get*FolderIcon() in bookmark_utils.h with TOOLKIT_VIEWS
instead of !OS_MACOSX && !OS_ANDROID.

Only create a |top_shadow_| in OmniboxPopupContentsView if
ui::MaterialDesignController::IsModeMaterial() otherwise the
image resource may not be available. |top_shadow_| is only used
in material mode anyway.

BUG=None

Committed: https://crrev.com/ce97cfa8b2dda4b9636bdbb999dcb474fc6d78de
Cr-Commit-Position: refs/heads/master@{#347308}

[jackhou1, 2015-09-03 02:41:47]

jackhou@chromium.org changed reviewers:
+ sky@chromium.org

[jackhou1, 2015-09-03 02:41:48]

sky, could you take a look?

[sky, 2015-09-03 13:20:09]

sky@chromium.org changed reviewers:
+ estade@chromium.org

[sky, 2015-09-03 13:20:10]

+estade
LGTM

https://codereview.chromium.org/1306873006/diff/20001/chrome/browser/ui/views...
File chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc (right):

https://codereview.chromium.org/1306873006/diff/20001/chrome/browser/ui/views...
chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc:73: top_shadow_ =
theme->GetImageSkiaNamed(IDR_OMNIBOX_DROPDOWN_SHADOW_TOP);
member initialize this to nullptr so the value is initialized always.

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

estade@chromium.org changed reviewers:
+ tdanderson@chromium.org

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

bookmark utils lgtm

https://codereview.chromium.org/1306873006/diff/20001/chrome/browser/ui/views...
File chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc (right):

https://codereview.chromium.org/1306873006/diff/20001/chrome/browser/ui/views...
chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc:73: top_shadow_ =
theme->GetImageSkiaNamed(IDR_OMNIBOX_DROPDOWN_SHADOW_TOP);
On 2015/09/03 13:20:10, sky wrote:
> member initialize this to nullptr so the value is initialized always.

+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]

https://codereview.chromium.org/1306873006/diff/20001/chrome/browser/ui/views...
File chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc (right):

https://codereview.chromium.org/1306873006/diff/20001/chrome/browser/ui/views...
chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc:73: top_shadow_ =
theme->GetImageSkiaNamed(IDR_OMNIBOX_DROPDOWN_SHADOW_TOP);
On 2015/09/03 13:53:07, Evan Stade wrote:
> On 2015/09/03 13:20:10, sky wrote:
> > member initialize this to nullptr so the value is initialized always.
> 
> +tdanderson for this file
> 
> I'd say you could/should change conditionals below from IsModeMaterial() to if
> (top_shadow_)

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

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

https://codereview.chromium.org/1306873006/diff/20001/chrome/browser/ui/views...
File chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc (right):

https://codereview.chromium.org/1306873006/diff/20001/chrome/browser/ui/views...
chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc:73: top_shadow_ =
theme->GetImageSkiaNamed(IDR_OMNIBOX_DROPDOWN_SHADOW_TOP);
On 2015/09/03 14:16:28, tdanderson wrote:
> On 2015/09/03 13:53:07, Evan Stade wrote:
> > On 2015/09/03 13:20:10, sky wrote:
> > > member initialize this to nullptr so the value is initialized always.
> > 
> > +tdanderson for this file
> > 
> > I'd say you could/should change conditionals below from IsModeMaterial() to
if
> > (top_shadow_)
> 
> On line 74? Sounds fine by me, would you mind making that change in this CL?

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]

https://codereview.chromium.org/1306873006/diff/20001/chrome/browser/ui/views...
File chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc (right):

https://codereview.chromium.org/1306873006/diff/20001/chrome/browser/ui/views...
chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc:73: top_shadow_ =
theme->GetImageSkiaNamed(IDR_OMNIBOX_DROPDOWN_SHADOW_TOP);
On 2015/09/03 13:20:10, sky wrote:
> member initialize this to nullptr so the value is initialized always.

Done.

https://codereview.chromium.org/1306873006/diff/20001/chrome/browser/ui/views...
chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc:73: top_shadow_ =
theme->GetImageSkiaNamed(IDR_OMNIBOX_DROPDOWN_SHADOW_TOP);
On 2015/09/03 16:09:40, Evan Stade wrote:
> On 2015/09/03 14:16:28, tdanderson wrote:
> > On 2015/09/03 13:53:07, Evan Stade wrote:
> > > On 2015/09/03 13:20:10, sky wrote:
> > > > member initialize this to nullptr so the value is initialized always.
> > > 
> > > +tdanderson for this file
> > > 
> > > I'd say you could/should change conditionals below from IsModeMaterial()
to
> if
> > > (top_shadow_)
> > 
> > On line 74? Sounds fine by me, would you mind making that change in this CL?
> 
> 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

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.

[jackhou1, 2015-09-04 01:50:51]

The CQ bit was checked by jackhou@chromium.org

[jackhou1, 2015-09-04 01:50:51]

The patchset sent to the CQ was uploaded after l-g-t-m from sky@chromium.org,
estade@chromium.org
Link to the patchset: https://codereview.chromium.org/1306873006/#ps40001
(title: "Address comments.")

[commit-bot: I haz the power, 2015-09-04 01:51:22]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1306873006/40001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1306873006/40001

[commit-bot: I haz the power, 2015-09-04 02:34:53]

Committed patchset #3 (id:40001)

[commit-bot: I haz the power, 2015-09-04 02:35:55]

Patchset 3 (id:??) landed as
https://crrev.com/ce97cfa8b2dda4b9636bdbb999dcb474fc6d78de
Cr-Commit-Position: refs/heads/master@{#347308}