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

Side by Side Diff: ash/launcher/app_list_button.cc

Issue 10905242: add ash_resources.grd and necessary changes to use images in ash/resources (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: don't guard ash_strings with aura=1 Created 8 years, 3 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/display/secondary_display_view.cc ('k') | ash/launcher/launcher.cc » ('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 (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/launcher/app_list_button.h" 5 #include "ash/launcher/app_list_button.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "ash/launcher/launcher_button_host.h" 9 #include "ash/launcher/launcher_button_host.h"
10 #include "ash/launcher/launcher_types.h" 10 #include "ash/launcher/launcher_types.h"
11 #include "grit/ash_resources.h"
11 #include "grit/ash_strings.h" 12 #include "grit/ash_strings.h"
12 #include "grit/ui_resources.h"
13 #include "ui/base/accessibility/accessible_view_state.h" 13 #include "ui/base/accessibility/accessible_view_state.h"
14 #include "ui/base/l10n/l10n_util.h" 14 #include "ui/base/l10n/l10n_util.h"
15 #include "ui/base/resource/resource_bundle.h" 15 #include "ui/base/resource/resource_bundle.h"
16 #include "ui/compositor/layer.h" 16 #include "ui/compositor/layer.h"
17 #include "ui/compositor/layer_animation_element.h" 17 #include "ui/compositor/layer_animation_element.h"
18 #include "ui/compositor/layer_animation_sequence.h" 18 #include "ui/compositor/layer_animation_sequence.h"
19 #include "ui/compositor/scoped_layer_animation_settings.h" 19 #include "ui/compositor/scoped_layer_animation_settings.h"
20 20
21 namespace ash { 21 namespace ash {
22 namespace internal { 22 namespace internal {
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 host_->MouseExitedButton(this); 125 host_->MouseExitedButton(this);
126 } 126 }
127 127
128 void AppListButton::GetAccessibleState(ui::AccessibleViewState* state) { 128 void AppListButton::GetAccessibleState(ui::AccessibleViewState* state) {
129 state->role = ui::AccessibilityTypes::ROLE_PUSHBUTTON; 129 state->role = ui::AccessibilityTypes::ROLE_PUSHBUTTON;
130 state->name = host_->GetAccessibleName(this); 130 state->name = host_->GetAccessibleName(this);
131 } 131 }
132 132
133 } // namespace internal 133 } // namespace internal
134 } // namespace ash 134 } // namespace ash
OLDNEW
« no previous file with comments | « ash/display/secondary_display_view.cc ('k') | ash/launcher/launcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698