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/lifetime/keep_alive_types.h" | 9 #include "chrome/browser/lifetime/keep_alive_types.h" |
10 #include "chrome/browser/lifetime/scoped_keep_alive.h" | 10 #include "chrome/browser/lifetime/scoped_keep_alive.h" |
11 #include "chrome/browser/ui/app_list/app_list_controller_delegate.h" | 11 #include "chrome/browser/ui/app_list/app_list_controller_delegate.h" |
12 #include "ui/app_list/app_list_switches.h" | 12 #include "ui/app_list/app_list_switches.h" |
13 #include "ui/app_list/views/app_list_main_view.h" | 13 #include "ui/app_list/views/app_list_main_view.h" |
14 #include "ui/app_list/views/app_list_view.h" | 14 #include "ui/app_list/views/app_list_view.h" |
15 #include "ui/app_list/views/contents_view.h" | 15 #include "ui/app_list/views/contents_view.h" |
16 | 16 |
17 AppListServiceViews::AppListServiceViews( | 17 AppListServiceViews::AppListServiceViews( |
18 scoped_ptr<AppListControllerDelegate> controller_delegate) | 18 std::unique_ptr<AppListControllerDelegate> controller_delegate) |
19 : shower_(this), | 19 : shower_(this), |
20 can_dismiss_(true), | 20 can_dismiss_(true), |
21 controller_delegate_(std::move(controller_delegate)) {} | 21 controller_delegate_(std::move(controller_delegate)) {} |
22 | 22 |
23 AppListServiceViews::~AppListServiceViews() {} | 23 AppListServiceViews::~AppListServiceViews() {} |
24 | 24 |
25 void AppListServiceViews::OnViewBeingDestroyed() { | 25 void AppListServiceViews::OnViewBeingDestroyed() { |
26 can_dismiss_ = true; | 26 can_dismiss_ = true; |
27 shower_.HandleViewBeingDestroyed(); | 27 shower_.HandleViewBeingDestroyed(); |
28 } | 28 } |
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
125 if (state != app_list::AppListModel::INVALID_STATE) { | 125 if (state != app_list::AppListModel::INVALID_STATE) { |
126 app_list::ContentsView* contents_view = | 126 app_list::ContentsView* contents_view = |
127 shower_.app_list()->app_list_main_view()->contents_view(); | 127 shower_.app_list()->app_list_main_view()->contents_view(); |
128 contents_view->SetActiveState(state, | 128 contents_view->SetActiveState(state, |
129 shower_.IsAppListVisible() /* animate */); | 129 shower_.IsAppListVisible() /* animate */); |
130 } | 130 } |
131 | 131 |
132 shower_.ShowForCurrentProfile(); | 132 shower_.ShowForCurrentProfile(); |
133 RecordAppListLaunch(); | 133 RecordAppListLaunch(); |
134 } | 134 } |
OLD | NEW |