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

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

Issue 22007003: ash: Rename "Autohide launcher" item. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: just shelf Created 7 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_alignment_menu.cc ('k') | ash/launcher/overflow_button.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/ash_constants.h" 9 #include "ash/ash_constants.h"
10 #include "ash/ash_switches.h" 10 #include "ash/ash_switches.h"
(...skipping 1216 matching lines...) Expand 10 before | Expand all | Expand 10 after
1227 if (IsShowingOverflowBubble()) 1227 if (IsShowingOverflowBubble())
1228 overflow_bubble_->Hide(); 1228 overflow_bubble_->Hide();
1229 } 1229 }
1230 1230
1231 views::FocusTraversable* LauncherView::GetPaneFocusTraversable() { 1231 views::FocusTraversable* LauncherView::GetPaneFocusTraversable() {
1232 return this; 1232 return this;
1233 } 1233 }
1234 1234
1235 void LauncherView::GetAccessibleState(ui::AccessibleViewState* state) { 1235 void LauncherView::GetAccessibleState(ui::AccessibleViewState* state) {
1236 state->role = ui::AccessibilityTypes::ROLE_TOOLBAR; 1236 state->role = ui::AccessibilityTypes::ROLE_TOOLBAR;
1237 state->name = l10n_util::GetStringUTF16(IDS_ASH_LAUNCHER_ACCESSIBLE_NAME); 1237 state->name = l10n_util::GetStringUTF16(IDS_ASH_SHELF_ACCESSIBLE_NAME);
1238 } 1238 }
1239 1239
1240 void LauncherView::OnGestureEvent(ui::GestureEvent* event) { 1240 void LauncherView::OnGestureEvent(ui::GestureEvent* event) {
1241 if (gesture_handler_.ProcessGestureEvent(*event)) 1241 if (gesture_handler_.ProcessGestureEvent(*event))
1242 event->StopPropagation(); 1242 event->StopPropagation();
1243 } 1243 }
1244 1244
1245 void LauncherView::LauncherItemAdded(int model_index) { 1245 void LauncherView::LauncherItemAdded(int model_index) {
1246 { 1246 {
1247 base::AutoReset<bool> cancelling_drag( 1247 base::AutoReset<bool> cancelling_drag(
(...skipping 458 matching lines...) Expand 10 before | Expand all | Expand 10 after
1706 bool LauncherView::ShouldShowTooltipForView(const views::View* view) const { 1706 bool LauncherView::ShouldShowTooltipForView(const views::View* view) const {
1707 if (view == GetAppListButtonView() && 1707 if (view == GetAppListButtonView() &&
1708 Shell::GetInstance()->GetAppListWindow()) 1708 Shell::GetInstance()->GetAppListWindow())
1709 return false; 1709 return false;
1710 const LauncherItem* item = LauncherItemForView(view); 1710 const LauncherItem* item = LauncherItemForView(view);
1711 return (!item || delegate_->ShouldShowTooltip(*item)); 1711 return (!item || delegate_->ShouldShowTooltip(*item));
1712 } 1712 }
1713 1713
1714 } // namespace internal 1714 } // namespace internal
1715 } // namespace ash 1715 } // namespace ash
OLDNEW
« no previous file with comments | « ash/launcher/launcher_alignment_menu.cc ('k') | ash/launcher/overflow_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698