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

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

Issue 9307036: Revert Aura changes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 10 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/launcher/app_launcher_button.h ('k') | ash/launcher/launcher_button_host.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 (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_launcher_button.h" 5 #include "ash/launcher/app_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 "ui/base/accessibility/accessible_view_state.h"
11 #include "ui/gfx/canvas_skia.h" 10 #include "ui/gfx/canvas_skia.h"
12 11
13 namespace ash { 12 namespace ash {
14 13
15 namespace internal { 14 namespace internal {
16 15
17 const int kImageSize = 32; 16 const int kImageSize = 32;
18 17
19 AppLauncherButton::AppLauncherButton(views::ButtonListener* listener, 18 AppLauncherButton::AppLauncherButton(views::ButtonListener* listener,
20 LauncherButtonHost* host) 19 LauncherButtonHost* host)
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 ImageButton::OnMouseDragged(event); 74 ImageButton::OnMouseDragged(event);
76 host_->MouseDraggedOnButton(this, event); 75 host_->MouseDraggedOnButton(this, event);
77 return true; 76 return true;
78 } 77 }
79 78
80 void AppLauncherButton::OnMouseExited(const views::MouseEvent& event) { 79 void AppLauncherButton::OnMouseExited(const views::MouseEvent& event) {
81 ImageButton::OnMouseExited(event); 80 ImageButton::OnMouseExited(event);
82 host_->MouseExitedButton(this); 81 host_->MouseExitedButton(this);
83 } 82 }
84 83
85 void AppLauncherButton::GetAccessibleState(ui::AccessibleViewState* state) {
86 state->role = ui::AccessibilityTypes::ROLE_PUSHBUTTON;
87 state->name = host_->GetAccessibleName(this);
88 }
89
90 } // namespace internal 84 } // namespace internal
91 } // namespace ash 85 } // namespace ash
OLDNEW
« no previous file with comments | « ash/launcher/app_launcher_button.h ('k') | ash/launcher/launcher_button_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698