ash/shell/window_type_launcher.cc - Issue 2148593004: mash: Move StatusTray and StatusAreaWidget to //ash/common

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 2148593004: mash: Move StatusTray and StatusAreaWidget to //ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@traydisplay

Patch Set: rebase Created 4 years, 5 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/shell/window_type_launcher.cc

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

index c5c5052faacee0452333c407e969b1ea9f273565..f2b2c6074dbdf1d768c17ce86c36629142084e97 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/status_area_widget.h"

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

#include "ash/common/wm_shell.h"

#include "ash/content/shell_content_state.h"

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

#include "ash/shell/example_factory.h"

#include "ash/shell/panel_window.h"

#include "ash/shell/toplevel_window.h"

-#include "ash/system/status_area_widget.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/shell.cc ('k') | ash/system/chromeos/media_security/multi_profile_media_tray_item_unittest.cc » ('j') | no next file with comments »