Added MediaRouterUIBrowserTest::toolbar_action_view_ to a Widget.

chrome/browser/ui/views/bookmarks/bookmark_bar_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/bookmarks/bookmark_bar_view.h"
 
 #include <stdint.h>
 
 #include <algorithm>
 #include <limits>
@@ skipping 224 matching lines @@
   }
 
   scoped_ptr<views::InkDropHover> CreateInkDropHover() const override {
     if (!ShouldShowInkDropHover())
       return nullptr;
     return make_scoped_ptr(new views::InkDropHover(
         size(), 0, GetInkDropCenter(), GetInkDropBaseColor()));
   }
 
   SkColor GetInkDropBaseColor() const override {
-    // TODO(bruthig): Inject the color instead of assuming a ThemeProvider is
-    // always available. Fall back on LabelButton::GetInkDropBaseColor() so as
-    // to avoid difficult to track down crashes.
-    return GetThemeProvider()
-               ? GetThemeProvider()->GetColor(
-                     ThemeProperties::COLOR_TOOLBAR_BUTTON_ICON)
-               : views::LabelButton::GetInkDropBaseColor();
+    return GetThemeProvider()->GetColor(
+        ThemeProperties::COLOR_TOOLBAR_BUTTON_ICON);
   }
 
  private:
   scoped_ptr<gfx::SlideAnimation> show_animation_;
 
   // Controls the visual feedback for the button state.
   views::ButtonInkDropDelegate ink_drop_delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkButtonBase);
 };
@@ skipping 76 matching lines @@
   }
 
   scoped_ptr<views::InkDropHover> CreateInkDropHover() const override {
     if (!ShouldShowInkDropHover())
       return nullptr;
     return make_scoped_ptr(new views::InkDropHover(
         size(), 0, GetInkDropCenter(), GetInkDropBaseColor()));
   }
 
   SkColor GetInkDropBaseColor() const override {
-    return GetThemeProvider()
-               ? GetThemeProvider()->GetColor(
-                     ThemeProperties::COLOR_TOOLBAR_BUTTON_ICON)
-               : views::LabelButton::GetInkDropBaseColor();
+    return GetThemeProvider()->GetColor(
+        ThemeProperties::COLOR_TOOLBAR_BUTTON_ICON);
   }
 
  private:
   // Controls the visual feedback for the button state.
   views::ButtonInkDropDelegate ink_drop_delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkMenuButtonBase);
 };
 
 // BookmarkFolderButton -------------------------------------------------------
@@ skipping 1795 matching lines @@
     return;
   apps_page_shortcut_->SetVisible(visible);
   UpdateBookmarksSeparatorVisibility();
   LayoutAndPaint();
 }
 
 void BookmarkBarView::OnShowManagedBookmarksPrefChanged() {
   if (UpdateOtherAndManagedButtonsVisibility())
     LayoutAndPaint();
 }