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

Unified Diff: ash/system/overview/overview_button_tray.cc

Issue 2095663004: Revert of mash: Convert TrayBackgroundView to wm common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
Index: ash/system/overview/overview_button_tray.cc
diff --git a/ash/system/overview/overview_button_tray.cc b/ash/system/overview/overview_button_tray.cc
index 386efce9d60b2738579578c2fc8ca21e43feb634..4e5f3a3f25578487b6b54e033ea117307a0a2a85 100644
--- a/ash/system/overview/overview_button_tray.cc
+++ b/ash/system/overview/overview_button_tray.cc
@@ -15,7 +15,6 @@
#include "ash/common/wm_shell.h"
#include "ash/shelf/shelf_util.h"
#include "ash/shell.h"
-#include "ash/system/status_area_widget.h"
#include "ash/wm/maximize_mode/maximize_mode_controller.h"
#include "grit/ash_resources.h"
#include "grit/ash_strings.h"
@@ -40,7 +39,7 @@
namespace ash {
OverviewButtonTray::OverviewButtonTray(StatusAreaWidget* status_area_widget)
- : TrayBackgroundView(status_area_widget->wm_shelf()), icon_(nullptr) {
+ : TrayBackgroundView(status_area_widget), icon_(NULL) {
SetContentsBackground();
icon_ = new views::ImageView();
« no previous file with comments | « ash/system/overview/overview_button_tray.h ('k') | ash/system/tray/media_security/multi_profile_media_tray_item_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698