Commit 52efad6b authored by xiyuan@chromium.org's avatar xiyuan@chromium.org

ash: Update launcher background to 0.8 black.

- Change launcher background alpha from 128 (0.5) to 204 (0.8);
- Export the background alpha const and get rid of a dup const in overflow bubble;

BUG=137309
TEST=Verify launcher background is 0.8 black.


Review URL: https://chromiumcodereview.appspot.com/10827202

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150461 0039d316-1c4b-4281-b951-d872f2087c98
parent c9bd90f8
......@@ -25,13 +25,6 @@
namespace ash {
namespace {
// Max alpha of the background.
const int kBackgroundAlpha = 128;
}
// The contents view of the Widget. This view contains LauncherView and
// sizes it to the width of the widget minus the size of the status area.
class Launcher::DelegateView : public views::WidgetDelegate,
......@@ -105,7 +98,7 @@ Launcher::Launcher(aura::Window* window_container,
launcher_view_(NULL),
alignment_(SHELF_ALIGNMENT_BOTTOM),
ALLOW_THIS_IN_INITIALIZER_LIST(
background_animator_(this, 0, kBackgroundAlpha)) {
background_animator_(this, 0, kLauncherBackgroundAlpha)) {
model_.reset(new LauncherModel);
if (Shell::GetInstance()->delegate()) {
delegate_.reset(
......
......@@ -7,6 +7,7 @@
namespace ash {
const int kLauncherPreferredSize = 48;
const int kLauncherBackgroundAlpha = 204;
LauncherItem::LauncherItem()
: type(TYPE_TABBED),
......
......@@ -22,6 +22,9 @@ typedef int LauncherID;
// added/removed.
ASH_EXPORT extern const int kLauncherPreferredSize;
// Max alpha of the launcher background.
ASH_EXPORT extern const int kLauncherBackgroundAlpha;
// Type the LauncherItem represents.
enum LauncherItemType {
// Represents a tabbed browser.
......
......@@ -19,9 +19,6 @@ namespace internal {
namespace {
// This should be the same color as the darkest launcher bar.
const SkColor kLauncherColor = SkColorSetARGB(0x80, 0, 0, 0);
// Max bubble size to screen size ratio.
const float kMaxBubbleSizeToScreenRatio = 0.5f;
......@@ -121,7 +118,7 @@ void OverflowBubbleView::InitOverflowBubble(LauncherDelegate* delegate,
set_anchor_view(anchor);
set_arrow_location(GetBubbleArrowLocation(shelf_alignment));
set_background(NULL);
set_color(kLauncherColor);
set_color(SkColorSetARGB(kLauncherBackgroundAlpha, 0, 0, 0));
set_margins(gfx::Insets(kPadding, kPadding, kPadding, kPadding));
set_move_with_anchor(true);
views::BubbleDelegateView::CreateBubble(this);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment