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

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

Issue 16979002: Add ContextMenuSourceType to views::ContextMenuController::ShowContextMenuForView. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix win build Created 7 years, 6 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
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.h" 5 #include "ash/launcher/launcher.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 9
10 #include "ash/focus_cycler.h" 10 #include "ash/focus_cycler.h"
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 } 123 }
124 124
125 void Launcher::RemoveIconObserver(LauncherIconObserver* observer) { 125 void Launcher::RemoveIconObserver(LauncherIconObserver* observer) {
126 launcher_view_->RemoveIconObserver(observer); 126 launcher_view_->RemoveIconObserver(observer);
127 } 127 }
128 128
129 bool Launcher::IsShowingMenu() const { 129 bool Launcher::IsShowingMenu() const {
130 return launcher_view_->IsShowingMenu(); 130 return launcher_view_->IsShowingMenu();
131 } 131 }
132 132
133 void Launcher::ShowContextMenu(const gfx::Point& location) { 133 void Launcher::ShowContextMenu(const gfx::Point& location) {
sky 2013/06/17 16:08:19 I don't think this is used, can you nuke it? Other
varunjain 2013/06/17 20:13:55 Done.
134 launcher_view_->ShowContextMenu(location, false); 134 launcher_view_->ShowContextMenu(location, ui::MENU_SOURCE_MOUSE);
135 } 135 }
136 136
137 bool Launcher::IsShowingOverflowBubble() const { 137 bool Launcher::IsShowingOverflowBubble() const {
138 return launcher_view_->IsShowingOverflowBubble(); 138 return launcher_view_->IsShowingOverflowBubble();
139 } 139 }
140 140
141 void Launcher::SetVisible(bool visible) const { 141 void Launcher::SetVisible(bool visible) const {
142 launcher_view_->SetVisible(visible); 142 launcher_view_->SetVisible(visible);
143 } 143 }
144 144
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
184 184
185 void Launcher::SetLauncherViewBounds(gfx::Rect bounds) { 185 void Launcher::SetLauncherViewBounds(gfx::Rect bounds) {
186 launcher_view_->SetBoundsRect(bounds); 186 launcher_view_->SetBoundsRect(bounds);
187 } 187 }
188 188
189 gfx::Rect Launcher::GetLauncherViewBounds() const { 189 gfx::Rect Launcher::GetLauncherViewBounds() const {
190 return launcher_view_->bounds(); 190 return launcher_view_->bounds();
191 } 191 }
192 192
193 } // namespace ash 193 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698