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

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

Issue 10827271: Replace views::Event with ui::Event. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 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/launcher_view.h ('k') | ash/shell/lock_view.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/launcher_view.h" 5 #include "ash/launcher/launcher_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "ash/launcher/app_list_button.h" 9 #include "ash/launcher/app_list_button.h"
10 #include "ash/launcher/launcher_button.h" 10 #include "ash/launcher/launcher_button.h"
(...skipping 970 matching lines...) Expand 10 before | Expand all | Expand 10 after
981 case TYPE_APP_LIST: 981 case TYPE_APP_LIST:
982 return l10n_util::GetStringUTF16(IDS_AURA_APP_LIST_TITLE); 982 return l10n_util::GetStringUTF16(IDS_AURA_APP_LIST_TITLE);
983 983
984 case TYPE_BROWSER_SHORTCUT: 984 case TYPE_BROWSER_SHORTCUT:
985 return l10n_util::GetStringUTF16(IDS_AURA_NEW_TAB); 985 return l10n_util::GetStringUTF16(IDS_AURA_NEW_TAB);
986 } 986 }
987 return string16(); 987 return string16();
988 } 988 }
989 989
990 void LauncherView::ButtonPressed(views::Button* sender, 990 void LauncherView::ButtonPressed(views::Button* sender,
991 const views::Event& event) { 991 const ui::Event& event) {
992 // Do not handle mouse release during drag. 992 // Do not handle mouse release during drag.
993 if (dragging()) 993 if (dragging())
994 return; 994 return;
995 995
996 if (sender == overflow_button_) { 996 if (sender == overflow_button_) {
997 ShowOverflowBubble(); 997 ShowOverflowBubble();
998 return; 998 return;
999 } 999 }
1000 1000
1001 if (!delegate_) 1001 if (!delegate_)
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
1065 FOR_EACH_OBSERVER(LauncherIconObserver, observers_, 1065 FOR_EACH_OBSERVER(LauncherIconObserver, observers_,
1066 OnLauncherIconPositionsChanged()); 1066 OnLauncherIconPositionsChanged());
1067 PreferredSizeChanged(); 1067 PreferredSizeChanged();
1068 } 1068 }
1069 1069
1070 void LauncherView::OnBoundsAnimatorDone(views::BoundsAnimator* animator) { 1070 void LauncherView::OnBoundsAnimatorDone(views::BoundsAnimator* animator) {
1071 } 1071 }
1072 1072
1073 } // namespace internal 1073 } // namespace internal
1074 } // namespace ash 1074 } // namespace ash
OLDNEW
« no previous file with comments | « ash/launcher/launcher_view.h ('k') | ash/shell/lock_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698