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

Unified Diff: ash/common/shelf/overflow_bubble_view.cc

Issue 2679133003: [ash-md] Wired in the Shelf color to be derived from the Wallpaper. (Closed)
Patch Set: Addressed nits. Created 3 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
« no previous file with comments | « ash/common/shelf/app_list_button.cc ('k') | ash/common/shelf/overflow_button.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/shelf/overflow_bubble_view.cc
diff --git a/ash/common/shelf/overflow_bubble_view.cc b/ash/common/shelf/overflow_bubble_view.cc
index a198d095aa0202d40b7c5605699a07f6de1c8828..19aa369c0e9cb9b8c72bd25ef9e2aa9bffb79675 100644
--- a/ash/common/shelf/overflow_bubble_view.cc
+++ b/ash/common/shelf/overflow_bubble_view.cc
@@ -6,7 +6,6 @@
#include <algorithm>
-#include "ash/common/material_design/material_design_controller.h"
#include "ash/common/shelf/shelf_constants.h"
#include "ash/common/shelf/wm_shelf.h"
#include "ash/common/wm_lookup.h"
@@ -50,10 +49,7 @@ void OverflowBubbleView::InitOverflowBubble(views::View* anchor,
set_arrow(GetBubbleArrow());
set_mirror_arrow_in_rtl(false);
set_background(NULL);
- SkColor color = MaterialDesignController::IsShelfMaterial()
- ? kShelfBaseColor
- : SkColorSetA(kShelfBaseColor, kShelfTranslucentAlpha);
- set_color(color);
+ set_color(kShelfDefaultBaseColor);
set_margins(gfx::Insets(kPadding, kPadding, kPadding, kPadding));
// Overflow bubble should not get focus. If it get focus when it is shown,
// active state item is changed to running state.
« no previous file with comments | « ash/common/shelf/app_list_button.cc ('k') | ash/common/shelf/overflow_button.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698