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

Side by Side Diff: chrome/browser/ui/views/chrome_browser_main_extra_parts_views.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_VIEWS_CHROME_BROWSER_MAIN_EXTRA_PARTS_VIEWS_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_CHROME_BROWSER_MAIN_EXTRA_PARTS_VIEWS_H_
6 #define CHROME_BROWSER_UI_VIEWS_CHROME_BROWSER_MAIN_EXTRA_PARTS_VIEWS_H_ 6 #define CHROME_BROWSER_UI_VIEWS_CHROME_BROWSER_MAIN_EXTRA_PARTS_VIEWS_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/chrome_browser_main_extra_parts.h" 11 #include "chrome/browser/chrome_browser_main_extra_parts.h"
11 12
12 namespace views { 13 namespace views {
13 class ViewsDelegate; 14 class ViewsDelegate;
14 } 15 }
15 16
16 #if defined(USE_AURA) 17 #if defined(USE_AURA)
17 namespace wm { 18 namespace wm {
18 class WMState; 19 class WMState;
19 } 20 }
20 #endif 21 #endif
21 22
22 class ChromeBrowserMainExtraPartsViews : public ChromeBrowserMainExtraParts { 23 class ChromeBrowserMainExtraPartsViews : public ChromeBrowserMainExtraParts {
23 public: 24 public:
24 ChromeBrowserMainExtraPartsViews(); 25 ChromeBrowserMainExtraPartsViews();
25 ~ChromeBrowserMainExtraPartsViews() override; 26 ~ChromeBrowserMainExtraPartsViews() override;
26 27
27 // Overridden from ChromeBrowserMainExtraParts: 28 // Overridden from ChromeBrowserMainExtraParts:
28 void ToolkitInitialized() override; 29 void ToolkitInitialized() override;
29 void PreCreateThreads() override; 30 void PreCreateThreads() override;
30 31
31 private: 32 private:
32 scoped_ptr<views::ViewsDelegate> views_delegate_; 33 std::unique_ptr<views::ViewsDelegate> views_delegate_;
33 34
34 #if defined(USE_AURA) 35 #if defined(USE_AURA)
35 scoped_ptr<wm::WMState> wm_state_; 36 std::unique_ptr<wm::WMState> wm_state_;
36 #endif 37 #endif
37 38
38 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsViews); 39 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsViews);
39 }; 40 };
40 41
41 #endif // CHROME_BROWSER_UI_VIEWS_CHROME_BROWSER_MAIN_EXTRA_PARTS_VIEWS_H_ 42 #endif // CHROME_BROWSER_UI_VIEWS_CHROME_BROWSER_MAIN_EXTRA_PARTS_VIEWS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698