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

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

Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 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 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 #ifndef CHROME_BROWSER_UI_ASH_APP_LIST_APP_LIST_SERVICE_ASH_H_ 5 #ifndef CHROME_BROWSER_UI_ASH_APP_LIST_APP_LIST_SERVICE_ASH_H_
6 #define CHROME_BROWSER_UI_ASH_APP_LIST_APP_LIST_SERVICE_ASH_H_ 6 #define CHROME_BROWSER_UI_ASH_APP_LIST_APP_LIST_SERVICE_ASH_H_
7 7
8 #include <memory>
9
8 #include "base/macros.h" 10 #include "base/macros.h"
9 #include "base/memory/scoped_ptr.h"
10 #include "chrome/browser/ui/app_list/app_list_service_impl.h" 11 #include "chrome/browser/ui/app_list/app_list_service_impl.h"
11 #include "ui/app_list/app_list_model.h" 12 #include "ui/app_list/app_list_model.h"
12 13
13 class AppListControllerDelegateAsh; 14 class AppListControllerDelegateAsh;
14 15
15 namespace base { 16 namespace base {
16 template <typename T> struct DefaultSingletonTraits; 17 template <typename T> struct DefaultSingletonTraits;
17 } 18 }
18 19
19 // AppListServiceAsh wraps functionality in ChromeLauncherController and the Ash 20 // AppListServiceAsh wraps functionality in ChromeLauncherController and the Ash
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 void EnableAppList(Profile* initial_profile, 55 void EnableAppList(Profile* initial_profile,
55 AppListEnableSource enable_source) override; 56 AppListEnableSource enable_source) override;
56 gfx::NativeWindow GetAppListWindow() override; 57 gfx::NativeWindow GetAppListWindow() override;
57 Profile* GetCurrentAppListProfile() override; 58 Profile* GetCurrentAppListProfile() override;
58 AppListControllerDelegate* GetControllerDelegate() override; 59 AppListControllerDelegate* GetControllerDelegate() override;
59 60
60 // ApplistServiceImpl overrides: 61 // ApplistServiceImpl overrides:
61 void CreateForProfile(Profile* default_profile) override; 62 void CreateForProfile(Profile* default_profile) override;
62 void DestroyAppList() override; 63 void DestroyAppList() override;
63 64
64 scoped_ptr<AppListControllerDelegateAsh> controller_delegate_; 65 std::unique_ptr<AppListControllerDelegateAsh> controller_delegate_;
65 66
66 DISALLOW_COPY_AND_ASSIGN(AppListServiceAsh); 67 DISALLOW_COPY_AND_ASSIGN(AppListServiceAsh);
67 }; 68 };
68 69
69 #endif // CHROME_BROWSER_UI_ASH_APP_LIST_APP_LIST_SERVICE_ASH_H_ 70 #endif // CHROME_BROWSER_UI_ASH_APP_LIST_APP_LIST_SERVICE_ASH_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/accelerator_commands_browsertest.cc ('k') | chrome/browser/ui/ash/ash_init.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698