Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(342)

Side by Side Diff: ash/system/tray/tray_image_item.cc

Issue 14949004: ash: Rename tray_views.{h,cc} to tray_utils.{h,cc} (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix browsertest Created 7 years, 7 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/system/tray/tray_image_item.h" 5 #include "ash/system/tray/tray_image_item.h"
6 6
7 #include "ash/system/tray/tray_item_view.h" 7 #include "ash/system/tray/tray_item_view.h"
8 #include "ash/system/tray/tray_views.h" 8 #include "ash/system/tray/tray_utils.h"
9 #include "ui/base/resource/resource_bundle.h" 9 #include "ui/base/resource/resource_bundle.h"
10 #include "ui/gfx/image/image.h" 10 #include "ui/gfx/image/image.h"
11 #include "ui/views/controls/image_view.h" 11 #include "ui/views/controls/image_view.h"
12 #include "ui/views/layout/fill_layout.h" 12 #include "ui/views/layout/fill_layout.h"
13 13
14 namespace ash { 14 namespace ash {
15 namespace internal { 15 namespace internal {
16 16
17 TrayImageItem::TrayImageItem(SystemTray* system_tray, int resource_id) 17 TrayImageItem::TrayImageItem(SystemTray* system_tray, int resource_id)
18 : SystemTrayItem(system_tray), 18 : SystemTrayItem(system_tray),
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 } 64 }
65 65
66 void TrayImageItem::DestroyDefaultView() { 66 void TrayImageItem::DestroyDefaultView() {
67 } 67 }
68 68
69 void TrayImageItem::DestroyDetailedView() { 69 void TrayImageItem::DestroyDetailedView() {
70 } 70 }
71 71
72 } // namespace internal 72 } // namespace internal
73 } // namespace ash 73 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698