ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.cc - Issue 2103603002: mash: Remove StatusAreaWidget references from system tray classes

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/chromeos/virtual_keyboard/virtual_keyboard_tray.cc

Issue 2103603002: mash: Remove StatusAreaWidget references from system tray classes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: review comments, rename SetSystemTrayHeight to SetTrayBubbleHeight 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/chromeos/virtual_keyboard/virtual_keyboard_tray.cc

diff --git a/ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.cc b/ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.cc

index beb6b748fe9e83241fa6c85eda38f1c9190387d8..38e35fdc878e096366a3ccb0948c81460d45a943 100644

--- a/ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.cc

+++ b/ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.cc

@@ -11,7 +11,6 @@

#include "ash/common/system/tray/tray_constants.h"

#include "ash/common/system/tray/tray_utils.h"

#include "ash/shell.h"

-#include "ash/system/status_area_widget.h"

#include "grit/ash_resources.h"

#include "grit/ash_strings.h"

#include "ui/base/l10n/l10n_util.h"

@@ -24,8 +23,8 @@

namespace ash {

-VirtualKeyboardTray::VirtualKeyboardTray(StatusAreaWidget* status_area_widget)

- : TrayBackgroundView(status_area_widget->wm_shelf()), button_(nullptr) {

+VirtualKeyboardTray::VirtualKeyboardTray(WmShelf* wm_shelf)

+ : TrayBackgroundView(wm_shelf), button_(nullptr) {

button_ = new views::ImageButton(this);

if (MaterialDesignController::IsShelfMaterial()) {

gfx::ImageSkia image_md =

« no previous file with comments | « ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.h ('k') | ash/system/overview/overview_button_tray.h » ('j') | no next file with comments »