OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 #include "chrome/browser/ui/app_list/app_list_service_views.h" | 5 #include "chrome/browser/ui/app_list/app_list_service_views.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "chrome/browser/apps/scoped_keep_alive.h" | 9 #include "chrome/browser/lifetime/scoped_keep_alive.h" |
10 #include "chrome/browser/ui/app_list/app_list_controller_delegate.h" | 10 #include "chrome/browser/ui/app_list/app_list_controller_delegate.h" |
11 #include "ui/app_list/app_list_switches.h" | 11 #include "ui/app_list/app_list_switches.h" |
12 #include "ui/app_list/views/app_list_main_view.h" | 12 #include "ui/app_list/views/app_list_main_view.h" |
13 #include "ui/app_list/views/app_list_view.h" | 13 #include "ui/app_list/views/app_list_view.h" |
14 #include "ui/app_list/views/contents_view.h" | 14 #include "ui/app_list/views/contents_view.h" |
15 | 15 |
16 AppListServiceViews::AppListServiceViews( | 16 AppListServiceViews::AppListServiceViews( |
17 scoped_ptr<AppListControllerDelegate> controller_delegate) | 17 scoped_ptr<AppListControllerDelegate> controller_delegate) |
18 : shower_(this), | 18 : shower_(this), |
19 can_dismiss_(true), | 19 can_dismiss_(true), |
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
109 | 109 |
110 AppListViewDelegate* AppListServiceViews::GetViewDelegateForCreate() { | 110 AppListViewDelegate* AppListServiceViews::GetViewDelegateForCreate() { |
111 return GetViewDelegate(shower_.profile()); | 111 return GetViewDelegate(shower_.profile()); |
112 } | 112 } |
113 | 113 |
114 void AppListServiceViews::ShowForProfileInternal( | 114 void AppListServiceViews::ShowForProfileInternal( |
115 Profile* profile, | 115 Profile* profile, |
116 app_list::AppListModel::State state) { | 116 app_list::AppListModel::State state) { |
117 DCHECK(profile); | 117 DCHECK(profile); |
118 | 118 |
119 ScopedKeepAlive keep_alive; | 119 ScopedKeepAlive keep_alive("AppListServiceViews"); |
120 | 120 |
121 CreateForProfile(profile); | 121 CreateForProfile(profile); |
122 | 122 |
123 if (state != app_list::AppListModel::INVALID_STATE) { | 123 if (state != app_list::AppListModel::INVALID_STATE) { |
124 app_list::ContentsView* contents_view = | 124 app_list::ContentsView* contents_view = |
125 shower_.app_list()->app_list_main_view()->contents_view(); | 125 shower_.app_list()->app_list_main_view()->contents_view(); |
126 contents_view->SetActiveState(state, | 126 contents_view->SetActiveState(state, |
127 shower_.IsAppListVisible() /* animate */); | 127 shower_.IsAppListVisible() /* animate */); |
128 } | 128 } |
129 | 129 |
130 shower_.ShowForCurrentProfile(); | 130 shower_.ShowForCurrentProfile(); |
131 RecordAppListLaunch(); | 131 RecordAppListLaunch(); |
132 } | 132 } |
OLD | NEW |