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

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

Issue 210083009: Add a whole-app-list unit test. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase due to fight with r270606 Created 6 years, 7 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 | « ui/app_list/app_list.gyp ('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/callback.h"
8 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
9 #include "base/observer_list.h" 10 #include "base/observer_list.h"
10 #include "ui/app_list/app_list_export.h" 11 #include "ui/app_list/app_list_export.h"
11 #include "ui/app_list/app_list_view_delegate_observer.h" 12 #include "ui/app_list/app_list_view_delegate_observer.h"
12 #include "ui/app_list/speech_ui_model_observer.h" 13 #include "ui/app_list/speech_ui_model_observer.h"
13 #include "ui/views/bubble/bubble_delegate.h" 14 #include "ui/views/bubble/bubble_delegate.h"
14 #include "ui/views/widget/widget.h" 15 #include "ui/views/widget/widget.h"
15 16
16 namespace base { 17 namespace base {
17 class FilePath; 18 class FilePath;
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 virtual void OnProfilesChanged() OVERRIDE; 92 virtual void OnProfilesChanged() OVERRIDE;
92 93
93 void Prerender(); 94 void Prerender();
94 95
95 void SetProfileByPath(const base::FilePath& profile_path); 96 void SetProfileByPath(const base::FilePath& profile_path);
96 97
97 void AddObserver(AppListViewObserver* observer); 98 void AddObserver(AppListViewObserver* observer);
98 void RemoveObserver(AppListViewObserver* observer); 99 void RemoveObserver(AppListViewObserver* observer);
99 100
100 // Set a callback to be called the next time any app list paints. 101 // Set a callback to be called the next time any app list paints.
101 static void SetNextPaintCallback(void (*callback)()); 102 void SetNextPaintCallback(const base::Closure& callback);
102 103
103 #if defined(OS_WIN) 104 #if defined(OS_WIN)
104 HWND GetHWND() const; 105 HWND GetHWND() const;
105 #endif 106 #endif
106 107
107 AppListMainView* app_list_main_view() { return app_list_main_view_; } 108 AppListMainView* app_list_main_view() { return app_list_main_view_; }
108 109
109 private: 110 private:
110 void InitAsBubbleInternal(gfx::NativeView parent, 111 void InitAsBubbleInternal(gfx::NativeView parent,
111 PaginationModel* pagination_model, 112 PaginationModel* pagination_model,
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 145
145 scoped_ptr<AppListViewDelegate> delegate_; 146 scoped_ptr<AppListViewDelegate> delegate_;
146 147
147 AppListMainView* app_list_main_view_; 148 AppListMainView* app_list_main_view_;
148 SigninView* signin_view_; 149 SigninView* signin_view_;
149 SpeechView* speech_view_; 150 SpeechView* speech_view_;
150 151
151 ObserverList<AppListViewObserver> observers_; 152 ObserverList<AppListViewObserver> observers_;
152 scoped_ptr<HideViewAnimationObserver> animation_observer_; 153 scoped_ptr<HideViewAnimationObserver> animation_observer_;
153 154
155 // For UMA and testing. If non-null, triggered when the app list is painted.
156 base::Closure next_paint_callback_;
157
154 DISALLOW_COPY_AND_ASSIGN(AppListView); 158 DISALLOW_COPY_AND_ASSIGN(AppListView);
155 }; 159 };
156 160
157 } // namespace app_list 161 } // namespace app_list
158 162
159 #endif // UI_APP_LIST_VIEWS_APP_LIST_VIEW_H_ 163 #endif // UI_APP_LIST_VIEWS_APP_LIST_VIEW_H_
OLDNEW
« no previous file with comments | « ui/app_list/app_list.gyp ('k') | ui/app_list/views/app_list_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698