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

Side by Side Diff: chrome/browser/ui/app_list/app_list_service_cocoa_mac.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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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_APP_LIST_APP_LIST_SERVICE_COCOA_MAC_H_ 5 #ifndef CHROME_BROWSER_UI_APP_LIST_APP_LIST_SERVICE_COCOA_MAC_H_
6 #define CHROME_BROWSER_UI_APP_LIST_APP_LIST_SERVICE_COCOA_MAC_H_ 6 #define CHROME_BROWSER_UI_APP_LIST_APP_LIST_SERVICE_COCOA_MAC_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "chrome/browser/ui/app_list/app_list_service_mac.h" 9 #include "chrome/browser/ui/app_list/app_list_service_mac.h"
10 10
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 bool ReadyToShow() override; 42 bool ReadyToShow() override;
43 43
44 private: 44 private:
45 friend class test::AppListServiceMacTestApi; 45 friend class test::AppListServiceMacTestApi;
46 friend struct base::DefaultSingletonTraits<AppListServiceCocoaMac>; 46 friend struct base::DefaultSingletonTraits<AppListServiceCocoaMac>;
47 47
48 AppListServiceCocoaMac(); 48 AppListServiceCocoaMac();
49 49
50 Profile* profile_; 50 Profile* profile_;
51 base::scoped_nsobject<AppListWindowController> window_controller_; 51 base::scoped_nsobject<AppListWindowController> window_controller_;
52 scoped_ptr<AppListControllerDelegateImpl> controller_delegate_; 52 std::unique_ptr<AppListControllerDelegateImpl> controller_delegate_;
53 53
54 DISALLOW_COPY_AND_ASSIGN(AppListServiceCocoaMac); 54 DISALLOW_COPY_AND_ASSIGN(AppListServiceCocoaMac);
55 }; 55 };
56 56
57 #endif // CHROME_BROWSER_UI_APP_LIST_APP_LIST_SERVICE_COCOA_MAC_H_ 57 #endif // CHROME_BROWSER_UI_APP_LIST_APP_LIST_SERVICE_COCOA_MAC_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/app_list/app_list_prefs_factory.cc ('k') | chrome/browser/ui/app_list/app_list_service_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698