ash/shell/window_type_launcher.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/shell/window_type_launcher.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

« no previous file with comments | « ash/common/system/web_notification/web_notification_tray.cc ('k') | ash/system/chromeos/session/logout_button_tray.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ash/shell/window_type_launcher.cc

diff --git a/ash/shell/window_type_launcher.cc b/ash/shell/window_type_launcher.cc

index 5e52da2cfd186df5560362f4f124de4d612e510f..f7beede633ea1c2fc4683f443ada339fc61e098e 100644

--- a/ash/shell/window_type_launcher.cc

+++ b/ash/shell/window_type_launcher.cc

@@ -8,6 +8,7 @@

#include "ash/common/session/session_state_delegate.h"

#include "ash/common/shell_window_ids.h"

+#include "ash/common/system/web_notification/web_notification_tray.h"

#include "ash/content/shell_content_state.h"

#include "ash/root_window_controller.h"

#include "ash/shelf/shelf_widget.h"

@@ -17,7 +18,6 @@

#include "ash/shell/toplevel_window.h"

#include "ash/shell_delegate.h"

#include "ash/system/status_area_widget.h"

-#include "ash/system/web_notification/web_notification_tray.h"

#include "ash/test/child_modal_window.h"

#include "base/strings/utf_string_conversions.h"

#include "ui/aura/window.h"

« no previous file with comments | « ash/common/system/web_notification/web_notification_tray.cc ('k') | ash/system/chromeos/session/logout_button_tray.h » ('j') | no next file with comments »