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

Side by Side Diff: ui/app_list/views/app_list_view.h

Issue 185623002: Add Hide and Show to the app list SearchBoxView. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ares_contents_switcher
Patch Set: add OVERRIDE Created 6 years, 9 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
« no previous file with comments | « ui/app_list/views/app_list_main_view.cc ('k') | ui/app_list/views/app_list_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 #ifndef UI_APP_LIST_VIEWS_APP_LIST_VIEW_H_ 5 #ifndef UI_APP_LIST_VIEWS_APP_LIST_VIEW_H_
6 #define UI_APP_LIST_VIEWS_APP_LIST_VIEW_H_ 6 #define UI_APP_LIST_VIEWS_APP_LIST_VIEW_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/observer_list.h" 9 #include "base/observer_list.h"
10 #include "ui/app_list/app_list_export.h" 10 #include "ui/app_list/app_list_export.h"
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 117
118 // Overridden from views::WidgetDelegateView: 118 // Overridden from views::WidgetDelegateView:
119 virtual views::View* GetInitiallyFocusedView() OVERRIDE; 119 virtual views::View* GetInitiallyFocusedView() OVERRIDE;
120 virtual gfx::ImageSkia GetWindowIcon() OVERRIDE; 120 virtual gfx::ImageSkia GetWindowIcon() OVERRIDE;
121 virtual bool WidgetHasHitTestMask() const OVERRIDE; 121 virtual bool WidgetHasHitTestMask() const OVERRIDE;
122 virtual void GetWidgetHitTestMask(gfx::Path* mask) const OVERRIDE; 122 virtual void GetWidgetHitTestMask(gfx::Path* mask) const OVERRIDE;
123 123
124 // Overridden from views::View: 124 // Overridden from views::View:
125 virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE; 125 virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE;
126 virtual void Layout() OVERRIDE; 126 virtual void Layout() OVERRIDE;
127 virtual void SchedulePaintInRect(const gfx::Rect& rect) OVERRIDE;
127 128
128 // Overridden from views::WidgetObserver: 129 // Overridden from views::WidgetObserver:
129 virtual void OnWidgetDestroying(views::Widget* widget) OVERRIDE; 130 virtual void OnWidgetDestroying(views::Widget* widget) OVERRIDE;
130 virtual void OnWidgetVisibilityChanged( 131 virtual void OnWidgetVisibilityChanged(
131 views::Widget* widget, bool visible) OVERRIDE; 132 views::Widget* widget, bool visible) OVERRIDE;
132 virtual void OnWidgetActivationChanged( 133 virtual void OnWidgetActivationChanged(
133 views::Widget* widget, bool active) OVERRIDE; 134 views::Widget* widget, bool active) OVERRIDE;
134 135
135 // Overridden from SpeechUIModelObserver: 136 // Overridden from SpeechUIModelObserver:
136 virtual void OnSpeechRecognitionStateChanged( 137 virtual void OnSpeechRecognitionStateChanged(
137 SpeechRecognitionState new_state) OVERRIDE; 138 SpeechRecognitionState new_state) OVERRIDE;
138 139
139 SigninDelegate* GetSigninDelegate(); 140 SigninDelegate* GetSigninDelegate();
140 141
141 scoped_ptr<AppListViewDelegate> delegate_; 142 scoped_ptr<AppListViewDelegate> delegate_;
142 143
143 AppListMainView* app_list_main_view_; 144 AppListMainView* app_list_main_view_;
144 SigninView* signin_view_; 145 SigninView* signin_view_;
145 SpeechView* speech_view_; 146 SpeechView* speech_view_;
146 147
147 ObserverList<AppListViewObserver> observers_; 148 ObserverList<AppListViewObserver> observers_;
148 scoped_ptr<HideViewAnimationObserver> animation_observer_; 149 scoped_ptr<HideViewAnimationObserver> animation_observer_;
149 150
150 DISALLOW_COPY_AND_ASSIGN(AppListView); 151 DISALLOW_COPY_AND_ASSIGN(AppListView);
151 }; 152 };
152 153
153 } // namespace app_list 154 } // namespace app_list
154 155
155 #endif // UI_APP_LIST_VIEWS_APP_LIST_VIEW_H_ 156 #endif // UI_APP_LIST_VIEWS_APP_LIST_VIEW_H_
OLDNEW
« no previous file with comments | « ui/app_list/views/app_list_main_view.cc ('k') | ui/app_list/views/app_list_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698