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

Side by Side Diff: ash/wm/app_list_controller.h

Issue 10831024: ash: Do not close the app-list if user clicked on a menu. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 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 | « no previous file | ash/wm/app_list_controller.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 #ifndef ASH_WM_APP_LIST_CONTROLLER_H_ 5 #ifndef ASH_WM_APP_LIST_CONTROLLER_H_
6 #define ASH_WM_APP_LIST_CONTROLLER_H_ 6 #define ASH_WM_APP_LIST_CONTROLLER_H_
7 7
8 #include "ash/launcher/launcher_icon_observer.h" 8 #include "ash/launcher/launcher_icon_observer.h"
9 #include "ash/shell_observer.h" 9 #include "ash/shell_observer.h"
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 // Sets app list view. If we are in visible mode, start showing animation. 60 // Sets app list view. If we are in visible mode, start showing animation.
61 // Otherwise, we just close it. 61 // Otherwise, we just close it.
62 void SetView(app_list::AppListView* view); 62 void SetView(app_list::AppListView* view);
63 63
64 // Forgets the view. 64 // Forgets the view.
65 void ResetView(); 65 void ResetView();
66 66
67 // Starts show/hide animation. 67 // Starts show/hide animation.
68 void ScheduleAnimation(); 68 void ScheduleAnimation();
69 69
70 void ProcessLocatedEvent(const aura::LocatedEvent& event); 70 void ProcessLocatedEvent(aura::Window* target,
71 const aura::LocatedEvent& event);
71 72
72 // Makes app list bubble update its bounds. 73 // Makes app list bubble update its bounds.
73 void UpdateBounds(); 74 void UpdateBounds();
74 75
75 // aura::EventFilter overrides: 76 // aura::EventFilter overrides:
76 virtual bool PreHandleKeyEvent(aura::Window* target, 77 virtual bool PreHandleKeyEvent(aura::Window* target,
77 aura::KeyEvent* event) OVERRIDE; 78 aura::KeyEvent* event) OVERRIDE;
78 virtual bool PreHandleMouseEvent(aura::Window* target, 79 virtual bool PreHandleMouseEvent(aura::Window* target,
79 aura::MouseEvent* event) OVERRIDE; 80 aura::MouseEvent* event) OVERRIDE;
80 virtual ui::TouchStatus PreHandleTouchEvent(aura::Window* target, 81 virtual ui::TouchStatus PreHandleTouchEvent(aura::Window* target,
(...skipping 29 matching lines...) Expand all
110 // The AppListView this class manages, owned by its widget. 111 // The AppListView this class manages, owned by its widget.
111 app_list::AppListView* view_; 112 app_list::AppListView* view_;
112 113
113 DISALLOW_COPY_AND_ASSIGN(AppListController); 114 DISALLOW_COPY_AND_ASSIGN(AppListController);
114 }; 115 };
115 116
116 } // namespace internal 117 } // namespace internal
117 } // namespace ash 118 } // namespace ash
118 119
119 #endif // ASH_WM_APP_LIST_CONTROLLER_H_ 120 #endif // ASH_WM_APP_LIST_CONTROLLER_H_
OLDNEW
« no previous file with comments | « no previous file | ash/wm/app_list_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698