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

Unified Diff: ash/shelf/overflow_bubble_view.cc

Issue 2036353002: mash: Move ash/common/wm/shelf to ash/common/shelf (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase again Created 4 years, 6 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/shelf/app_list_button.cc ('k') | ash/shelf/overflow_button.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shelf/overflow_bubble_view.cc
diff --git a/ash/shelf/overflow_bubble_view.cc b/ash/shelf/overflow_bubble_view.cc
index 594bbf335a1f89889c16a0db878ce5d0162f64cd..bcdf9d213350dc2318b6894495e42b81a5b44e63 100644
--- a/ash/shelf/overflow_bubble_view.cc
+++ b/ash/shelf/overflow_bubble_view.cc
@@ -6,11 +6,10 @@
#include <algorithm>
+#include "ash/common/shelf/shelf_constants.h"
#include "ash/common/shell_window_ids.h"
-#include "ash/common/wm/shelf/wm_shelf_constants.h"
#include "ash/root_window_controller.h"
#include "ash/shelf/shelf.h"
-#include "ash/shelf/shelf_constants.h"
#include "ash/shelf/shelf_view.h"
#include "ash/shell.h"
#include "ui/display/display.h"
@@ -46,7 +45,7 @@ void OverflowBubbleView::InitOverflowBubble(views::View* anchor,
set_arrow(GetBubbleArrow());
set_mirror_arrow_in_rtl(false);
set_background(NULL);
- set_color(SkColorSetARGB(wm::kShelfBackgroundAlpha, 0, 0, 0));
+ set_color(SkColorSetARGB(kShelfBackgroundAlpha, 0, 0, 0));
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/shelf/app_list_button.cc ('k') | ash/shelf/overflow_button.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698