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

Side by Side Diff: ui/app_list/cocoa/app_list_view_controller.h

Issue 117683002: Show the Mac app launcher window with a spinner while loading Chrome. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: typos Created 6 years, 11 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_COCOA_APP_LIST_VIEW_CONTROLLER_H_ 5 #ifndef UI_APP_LIST_COCOA_APP_LIST_VIEW_CONTROLLER_H_
6 #define UI_APP_LIST_COCOA_APP_LIST_VIEW_CONTROLLER_H_ 6 #define UI_APP_LIST_COCOA_APP_LIST_VIEW_CONTROLLER_H_
7 7
8 #import <Cocoa/Cocoa.h> 8 #import <Cocoa/Cocoa.h>
9 9
10 #include "base/mac/scoped_nsobject.h" 10 #include "base/mac/scoped_nsobject.h"
(...skipping 27 matching lines...) Expand all
38 base::scoped_nsobject<AppsSearchResultsController> 38 base::scoped_nsobject<AppsSearchResultsController>
39 appsSearchResultsController_; 39 appsSearchResultsController_;
40 base::scoped_nsobject<SigninViewController> signinViewController_; 40 base::scoped_nsobject<SigninViewController> signinViewController_;
41 41
42 // Subview for drawing the background. Hidden when the signin view is visible. 42 // Subview for drawing the background. Hidden when the signin view is visible.
43 base::scoped_nsobject<NSView> backgroundView_; 43 base::scoped_nsobject<NSView> backgroundView_;
44 44
45 // Subview of |backgroundView_| that slides out when search results are shown. 45 // Subview of |backgroundView_| that slides out when search results are shown.
46 base::scoped_nsobject<NSView> contentsView_; 46 base::scoped_nsobject<NSView> contentsView_;
47 47
48 // Progress indicator that is visible while the delegate is NULL.
49 base::scoped_nsobject<NSProgressIndicator> loadingIndicator_;
50
48 scoped_ptr<app_list::AppListViewDelegate> delegate_; 51 scoped_ptr<app_list::AppListViewDelegate> delegate_;
49 scoped_ptr<app_list::AppListModelObserverBridge> 52 scoped_ptr<app_list::AppListModelObserverBridge>
50 app_list_model_observer_bridge_; 53 app_list_model_observer_bridge_;
51 BOOL showingSearchResults_; 54 BOOL showingSearchResults_;
52 } 55 }
53 56
54 @property(readonly, nonatomic) AppsSearchBoxController* 57 @property(readonly, nonatomic) AppsSearchBoxController*
55 searchBoxController; 58 searchBoxController;
56 59
57 - (app_list::AppListViewDelegate*)delegate; 60 - (app_list::AppListViewDelegate*)delegate;
58 - (void)setDelegate:(scoped_ptr<app_list::AppListViewDelegate>)newDelegate; 61 - (void)setDelegate:(scoped_ptr<app_list::AppListViewDelegate>)newDelegate;
59 - (void)onProfilesChanged; 62 - (void)onProfilesChanged;
60 63
61 @end 64 @end
62 65
63 @interface AppListViewController (TestingAPI) 66 @interface AppListViewController (TestingAPI)
64 67
65 @property(nonatomic, readonly) BOOL showingSearchResults; 68 @property(nonatomic, readonly) BOOL showingSearchResults;
66 69
67 - (AppsGridController*)appsGridController; 70 - (AppsGridController*)appsGridController;
68 - (NSSegmentedControl*)pagerControl; 71 - (NSSegmentedControl*)pagerControl;
69 - (NSView*)backgroundView; 72 - (NSView*)backgroundView;
70 73
71 @end 74 @end
72 75
73 #endif // UI_APP_LIST_COCOA_APP_LIST_VIEW_CONTROLLER_H_ 76 #endif // UI_APP_LIST_COCOA_APP_LIST_VIEW_CONTROLLER_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/app_list/app_list_service_mac.mm ('k') | ui/app_list/cocoa/app_list_view_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698