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

Side by Side Diff: ash/system/tray/tray_item_more.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_item_more.h" 5 #include "ash/system/tray/tray_item_more.h"
6 6
7 #include "ash/system/tray/fixed_sized_image_view.h" 7 #include "ash/system/tray/fixed_sized_image_view.h"
8 #include "ash/system/tray/system_tray_item.h" 8 #include "ash/system/tray/system_tray_item.h"
9 #include "ash/system/tray/tray_constants.h" 9 #include "ash/system/tray/tray_constants.h"
10 #include "ash/system/tray/tray_views.h"
11 #include "grit/ash_resources.h" 10 #include "grit/ash_resources.h"
12 #include "ui/base/accessibility/accessible_view_state.h" 11 #include "ui/base/accessibility/accessible_view_state.h"
13 #include "ui/base/resource/resource_bundle.h" 12 #include "ui/base/resource/resource_bundle.h"
14 #include "ui/gfx/image/image.h" 13 #include "ui/gfx/image/image.h"
15 #include "ui/views/controls/image_view.h" 14 #include "ui/views/controls/image_view.h"
16 #include "ui/views/controls/label.h" 15 #include "ui/views/controls/label.h"
17 #include "ui/views/layout/box_layout.h" 16 #include "ui/views/layout/box_layout.h"
18 17
19 namespace ash { 18 namespace ash {
20 namespace internal { 19 namespace internal {
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 } 98 }
100 } 99 }
101 100
102 void TrayItemMore::GetAccessibleState(ui::AccessibleViewState* state) { 101 void TrayItemMore::GetAccessibleState(ui::AccessibleViewState* state) {
103 state->role = ui::AccessibilityTypes::ROLE_PUSHBUTTON; 102 state->role = ui::AccessibilityTypes::ROLE_PUSHBUTTON;
104 state->name = accessible_name_; 103 state->name = accessible_name_;
105 } 104 }
106 105
107 } // namespace internal 106 } // namespace internal
108 } // namespace ash 107 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698