ash/system/status_area_widget.cc - Issue 2035543004: Shuffles and renames ash/common/wm 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/status_area_widget.cc

Issue 2035543004: Shuffles and renames ash/common/wm classes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: random changes for chrome tests 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:

Index: ash/system/status_area_widget.cc

diff --git a/ash/system/status_area_widget.cc b/ash/system/status_area_widget.cc

index a9297f8402cf71174cd537bb360c9e7a9a26da77..224dfc0a98d967aa939d3a258cd96739eb7d06bb 100644

--- a/ash/system/status_area_widget.cc

+++ b/ash/system/status_area_widget.cc

@@ -5,8 +5,8 @@

#include "ash/system/status_area_widget.h"

#include "ash/common/shell_window_ids.h"

-#include "ash/common/wm/wm_root_window_controller.h"

-#include "ash/common/wm/wm_window.h"

+#include "ash/common/wm_root_window_controller.h"

+#include "ash/common/wm_window.h"

#include "ash/shelf/shelf_layout_manager.h"

#include "ash/shelf/shelf_widget.h"

#include "ash/shell.h"

@@ -26,7 +26,7 @@

namespace ash {

-StatusAreaWidget::StatusAreaWidget(wm::WmWindow* status_container,

+StatusAreaWidget::StatusAreaWidget(WmWindow* status_container,

ShelfWidget* shelf_widget)

: status_area_widget_delegate_(new StatusAreaWidgetDelegate),

overview_button_tray_(NULL),