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

Side by Side Diff: chrome/browser/ui/ash/app_list/app_list_service_ash.cc

Issue 2364173002: Add app_list_presenterr pointer in app_list_presenter_delegate_mus to use dismiss function (Closed)
Patch Set: remove unnecessary includes Created 4 years, 2 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
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 #include "chrome/browser/ui/ash/app_list/app_list_service_ash.h" 5 #include "chrome/browser/ui/ash/app_list/app_list_service_ash.h"
6 6
7 #include "ash/app_list/app_list_presenter_delegate.h" 7 #include "ash/app_list/app_list_presenter_delegate.h"
8 #include "ash/app_list/app_list_presenter_delegate_factory.h" 8 #include "ash/app_list/app_list_presenter_delegate_factory.h"
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 explicit AppListPresenterDelegateFactoryMus( 53 explicit AppListPresenterDelegateFactoryMus(
54 std::unique_ptr<app_list::AppListViewDelegateFactory> 54 std::unique_ptr<app_list::AppListViewDelegateFactory>
55 view_delegate_factory) 55 view_delegate_factory)
56 : view_delegate_factory_(std::move(view_delegate_factory)) {} 56 : view_delegate_factory_(std::move(view_delegate_factory)) {}
57 57
58 ~AppListPresenterDelegateFactoryMus() override {} 58 ~AppListPresenterDelegateFactoryMus() override {}
59 59
60 std::unique_ptr<app_list::AppListPresenterDelegate> GetDelegate( 60 std::unique_ptr<app_list::AppListPresenterDelegate> GetDelegate(
61 app_list::AppListPresenter* presenter) override { 61 app_list::AppListPresenter* presenter) override {
62 return base::MakeUnique<AppListPresenterDelegateMus>( 62 return base::MakeUnique<AppListPresenterDelegateMus>(
63 view_delegate_factory_.get()); 63 presenter, view_delegate_factory_.get());
64 } 64 }
65 65
66 private: 66 private:
67 std::unique_ptr<app_list::AppListViewDelegateFactory> view_delegate_factory_; 67 std::unique_ptr<app_list::AppListViewDelegateFactory> view_delegate_factory_;
68 68
69 DISALLOW_COPY_AND_ASSIGN(AppListPresenterDelegateFactoryMus); 69 DISALLOW_COPY_AND_ASSIGN(AppListPresenterDelegateFactoryMus);
70 }; 70 };
71 71
72 } // namespace 72 } // namespace
73 73
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
205 // static 205 // static
206 AppListService* AppListService::Get() { 206 AppListService* AppListService::Get() {
207 return AppListServiceAsh::GetInstance(); 207 return AppListServiceAsh::GetInstance();
208 } 208 }
209 209
210 // static 210 // static
211 void AppListService::InitAll(Profile* initial_profile, 211 void AppListService::InitAll(Profile* initial_profile,
212 const base::FilePath& profile_path) { 212 const base::FilePath& profile_path) {
213 AppListServiceAsh::GetInstance()->Init(initial_profile); 213 AppListServiceAsh::GetInstance()->Init(initial_profile);
214 } 214 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698