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

Side by Side Diff: ash/shelf/alternate_app_list_button.cc

Issue 224113005: Eliminate ash::internal namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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
« no previous file with comments | « ash/shelf/alternate_app_list_button.h ('k') | ash/shelf/app_list_button.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/shelf/alternate_app_list_button.h" 5 #include "ash/shelf/alternate_app_list_button.h"
6 6
7 #include "ash/ash_constants.h" 7 #include "ash/ash_constants.h"
8 #include "ash/ash_switches.h" 8 #include "ash/ash_switches.h"
9 #include "ash/shelf/shelf_button.h" 9 #include "ash/shelf/shelf_button.h"
10 #include "ash/shelf/shelf_button_host.h" 10 #include "ash/shelf/shelf_button_host.h"
11 #include "ash/shelf/shelf_item_types.h" 11 #include "ash/shelf/shelf_item_types.h"
12 #include "ash/shelf/shelf_layout_manager.h" 12 #include "ash/shelf/shelf_layout_manager.h"
13 #include "ash/shelf/shelf_widget.h" 13 #include "ash/shelf/shelf_widget.h"
14 #include "ash/shell.h" 14 #include "ash/shell.h"
15 #include "grit/ash_resources.h" 15 #include "grit/ash_resources.h"
16 #include "grit/ash_strings.h" 16 #include "grit/ash_strings.h"
17 #include "ui/accessibility/ax_view_state.h" 17 #include "ui/accessibility/ax_view_state.h"
18 #include "ui/base/l10n/l10n_util.h" 18 #include "ui/base/l10n/l10n_util.h"
19 #include "ui/base/resource/resource_bundle.h" 19 #include "ui/base/resource/resource_bundle.h"
20 #include "ui/compositor/layer.h" 20 #include "ui/compositor/layer.h"
21 #include "ui/compositor/layer_animation_element.h" 21 #include "ui/compositor/layer_animation_element.h"
22 #include "ui/compositor/layer_animation_sequence.h" 22 #include "ui/compositor/layer_animation_sequence.h"
23 #include "ui/compositor/scoped_layer_animation_settings.h" 23 #include "ui/compositor/scoped_layer_animation_settings.h"
24 #include "ui/gfx/canvas.h" 24 #include "ui/gfx/canvas.h"
25 #include "ui/gfx/image/image_skia_operations.h" 25 #include "ui/gfx/image/image_skia_operations.h"
26 #include "ui/views/controls/button/image_button.h" 26 #include "ui/views/controls/button/image_button.h"
27 #include "ui/views/painter.h" 27 #include "ui/views/painter.h"
28 28
29 namespace ash { 29 namespace ash {
30 namespace internal {
31
32 // static 30 // static
33 const int AlternateAppListButton::kImageBoundsSize = 7; 31 const int AlternateAppListButton::kImageBoundsSize = 7;
34 32
35 33
36 AlternateAppListButton::AlternateAppListButton(views::ButtonListener* listener, 34 AlternateAppListButton::AlternateAppListButton(views::ButtonListener* listener,
37 ShelfButtonHost* host, 35 ShelfButtonHost* host,
38 ShelfWidget* shelf_widget) 36 ShelfWidget* shelf_widget)
39 : views::ImageButton(listener), 37 : views::ImageButton(listener),
40 host_(host), 38 host_(host),
41 shelf_widget_(shelf_widget) { 39 shelf_widget_(shelf_widget) {
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 161
164 views::Painter::PaintFocusPainter(this, canvas, focus_painter()); 162 views::Painter::PaintFocusPainter(this, canvas, focus_painter());
165 } 163 }
166 164
167 void AlternateAppListButton::GetAccessibleState( 165 void AlternateAppListButton::GetAccessibleState(
168 ui::AXViewState* state) { 166 ui::AXViewState* state) {
169 state->role = ui::AX_ROLE_BUTTON; 167 state->role = ui::AX_ROLE_BUTTON;
170 state->name = host_->GetAccessibleName(this); 168 state->name = host_->GetAccessibleName(this);
171 } 169 }
172 170
173 } // namespace internal
174 } // namespace ash 171 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shelf/alternate_app_list_button.h ('k') | ash/shelf/app_list_button.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698