ash/system/overview/overview_button_tray.cc - Issue 2099603002: Reland: mash: Convert TrayBackgroundView to wm common types

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2099603002: Reland: mash: Convert TrayBackgroundView to wm common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix conflict 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/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 »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 f8fd956215624bb1adb22cf3903b638ce9322248..4a743438d77ef8120df5b71e2abd42e49fb73de0 100644

--- a/ash/system/overview/overview_button_tray.cc

+++ b/ash/system/overview/overview_button_tray.cc

@@ -15,6 +15,7 @@

#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"

@@ -39,7 +40,7 @@ const int kVerticalShelfVerticalPadding = 5;

namespace ash {

OverviewButtonTray::OverviewButtonTray(StatusAreaWidget* status_area_widget)

- : TrayBackgroundView(status_area_widget), icon_(NULL) {

+ : TrayBackgroundView(status_area_widget->wm_shelf()), icon_(nullptr) {

SetContentsBackground();

icon_ = new views::ImageView();