ash/wm/status_area_layout_manager.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/wm/status_area_layout_manager.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/wm/status_area_layout_manager.cc

diff --git a/ash/wm/status_area_layout_manager.cc b/ash/wm/status_area_layout_manager.cc

index 218dbbb225e28dfb0a860c477776d2ae7a571b4c..8eb8bc2a1213662c2965d0956d864d78c08b47a9 100644

--- a/ash/wm/status_area_layout_manager.cc

+++ b/ash/wm/status_area_layout_manager.cc

@@ -4,9 +4,9 @@

#include "ash/wm/status_area_layout_manager.h"

+#include "ash/common/system/status_area_widget.h"

#include "ash/shelf/shelf_layout_manager.h"

#include "ash/shelf/shelf_widget.h"

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

#include "base/auto_reset.h"

#include "ui/aura/window.h"

#include "ui/views/widget/widget.h"

« no previous file with comments | « ash/wm/gestures/shelf_gesture_handler.cc ('k') | ash/wm/workspace_controller_unittest.cc » ('j') | no next file with comments »