ash/common/system/tray/tray_image_item.cc - Issue 2063813002: mash: Move SystemTrayImage and TrayImageItem 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/tray/tray_image_item.cc

Issue 2063813002: mash: Move SystemTrayImage and TrayImageItem to //ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@wmnotifier

Patch Set: rebase 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

Index: ash/common/system/tray/tray_image_item.cc

diff --git a/ash/system/tray/tray_image_item.cc b/ash/common/system/tray/tray_image_item.cc

similarity index 93%

rename from ash/system/tray/tray_image_item.cc

rename to ash/common/system/tray/tray_image_item.cc

index c8a8af3ba181179ef0e6215ba337a97316623c3c..136b6efc957401ceacc232cfb7251510f5c18783 100644

--- a/ash/system/tray/tray_image_item.cc

+++ b/ash/common/system/tray/tray_image_item.cc

@@ -2,13 +2,12 @@

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

// found in the LICENSE file.

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

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

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

-#include "ash/shelf/shelf_util.h"

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

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

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

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

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

#include "ui/base/resource/resource_bundle.h"

#include "ui/gfx/image/image.h"

#include "ui/views/controls/image_view.h"

« ash/common/system/tray/DEPS ('K') | « ash/common/system/tray/tray_image_item.h ('k') | ash/common/system/tray/tray_item_view.h » ('j') | no next file with comments »