ash/common/system/status_area_widget.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/common/system/status_area_widget.cc

Issue 2148593004: mash: Move StatusTray and StatusAreaWidget to //ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@traydisplay

Patch Set: cleanup test 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/common/system/status_area_widget.cc

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

similarity index 98%

rename from ash/system/status_area_widget.cc

rename to ash/common/system/status_area_widget.cc

index 0f91614e9857c4735d3d15f08400e10f52fa31bd..a74c1457e6bd269ad9e3467a79b6e97030e4f72e 100644

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

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

@@ -2,19 +2,19 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

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

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

#include "ash/common/shelf/wm_shelf.h"

#include "ash/common/shell_window_ids.h"

#include "ash/common/system/overview/overview_button_tray.h"

#include "ash/common/system/status_area_widget_delegate.h"

+#include "ash/common/system/tray/system_tray.h"

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

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

#include "ash/common/wm_lookup.h"

#include "ash/common/wm_root_window_controller.h"

#include "ash/common/wm_shell.h"

#include "ash/common/wm_window.h"

-#include "ash/system/tray/system_tray.h"

#include "base/i18n/time_formatting.h"

#if defined(OS_CHROMEOS)

« no previous file with comments | « ash/common/system/status_area_widget.h ('k') | ash/common/system/tray/system_tray.h » ('j') | ash/common/system/tray/system_tray_unittest.cc » ('J')