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

Side by Side Diff: ash/shell.h

Issue 460933002: Split Shell::ToggleAppList() into ShowAppList and DismissAppList. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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
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 #ifndef ASH_SHELL_H_ 5 #ifndef ASH_SHELL_H_
6 #define ASH_SHELL_H_ 6 #define ASH_SHELL_H_
7 7
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after
224 224
225 void set_target_root_window(aura::Window* target_root_window) { 225 void set_target_root_window(aura::Window* target_root_window) {
226 target_root_window_ = target_root_window; 226 target_root_window_ = target_root_window;
227 } 227 }
228 228
229 // Shows the context menu for the background and launcher at 229 // Shows the context menu for the background and launcher at
230 // |location_in_screen| (in screen coordinates). 230 // |location_in_screen| (in screen coordinates).
231 void ShowContextMenu(const gfx::Point& location_in_screen, 231 void ShowContextMenu(const gfx::Point& location_in_screen,
232 ui::MenuSourceType source_type); 232 ui::MenuSourceType source_type);
233 233
234 // Toggles the app list. |window| specifies in which display the app 234 // Shows the app list. |window| specifies in which display the app
235 // list should be shown. If this is NULL, the active root window 235 // list should be shown. If this is NULL, the active root window
236 // will be used. 236 // will be used.
237 void ToggleAppList(aura::Window* anchor); 237 void ShowAppList(aura::Window* anchor);
238
239 // Dismisses the app list.
240 void DismissAppList();
238 241
239 // Returns app list target visibility. 242 // Returns app list target visibility.
240 bool GetAppListTargetVisibility() const; 243 bool GetAppListTargetVisibility() const;
241 244
242 // Returns app list window or NULL if it is not visible. 245 // Returns app list window or NULL if it is not visible.
243 aura::Window* GetAppListWindow(); 246 aura::Window* GetAppListWindow();
244 247
245 // Returns app list view or NULL if it is not visible. 248 // Returns app list view or NULL if it is not visible.
246 app_list::AppListView* GetAppListView(); 249 app_list::AppListView* GetAppListView();
247 250
(...skipping 503 matching lines...) Expand 10 before | Expand all | Expand 10 after
751 754
752 // Injected content::GPUDataManager support. 755 // Injected content::GPUDataManager support.
753 scoped_ptr<GPUSupport> gpu_support_; 756 scoped_ptr<GPUSupport> gpu_support_;
754 757
755 DISALLOW_COPY_AND_ASSIGN(Shell); 758 DISALLOW_COPY_AND_ASSIGN(Shell);
756 }; 759 };
757 760
758 } // namespace ash 761 } // namespace ash
759 762
760 #endif // ASH_SHELL_H_ 763 #endif // ASH_SHELL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698