| OLD | NEW |
| 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/tabbed_launcher_button.h" | 5 #include "ash/launcher/tabbed_launcher_button.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 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/ui_resources.h" | 11 #include "grit/ash_resources.h" |
| 12 #include "ui/base/accessibility/accessible_view_state.h" | 12 #include "ui/base/accessibility/accessible_view_state.h" |
| 13 #include "ui/base/animation/multi_animation.h" | 13 #include "ui/base/animation/multi_animation.h" |
| 14 #include "ui/base/resource/resource_bundle.h" | 14 #include "ui/base/resource/resource_bundle.h" |
| 15 #include "ui/gfx/canvas.h" | 15 #include "ui/gfx/canvas.h" |
| 16 #include "ui/gfx/image/image.h" | 16 #include "ui/gfx/image/image.h" |
| 17 #include "ui/gfx/insets.h" | 17 #include "ui/gfx/insets.h" |
| 18 | 18 |
| 19 namespace ash { | 19 namespace ash { |
| 20 namespace internal { | 20 namespace internal { |
| 21 | 21 |
| (...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 137 state->role = ui::AccessibilityTypes::ROLE_PUSHBUTTON; | 137 state->role = ui::AccessibilityTypes::ROLE_PUSHBUTTON; |
| 138 state->name = host()->GetAccessibleName(this); | 138 state->name = host()->GetAccessibleName(this); |
| 139 } | 139 } |
| 140 | 140 |
| 141 LauncherButton::IconView* TabbedLauncherButton::CreateIconView() { | 141 LauncherButton::IconView* TabbedLauncherButton::CreateIconView() { |
| 142 return new IconView(this); | 142 return new IconView(this); |
| 143 } | 143 } |
| 144 | 144 |
| 145 } // namespace internal | 145 } // namespace internal |
| 146 } // namespace ash | 146 } // namespace ash |
| OLD | NEW |