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

Side by Side Diff: chrome/browser/extensions/api/tabs/ash_panel_contents.h

Issue 1871713002: Convert //chrome/browser/extensions from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase and fix header 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 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 #ifndef CHROME_BROWSER_EXTENSIONS_API_TABS_ASH_PANEL_CONTENTS_H_ 5 #ifndef CHROME_BROWSER_EXTENSIONS_API_TABS_ASH_PANEL_CONTENTS_H_
6 #define CHROME_BROWSER_EXTENSIONS_API_TABS_ASH_PANEL_CONTENTS_H_ 6 #define CHROME_BROWSER_EXTENSIONS_API_TABS_ASH_PANEL_CONTENTS_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory>
10 #include <vector> 11 #include <vector>
11 12
12 #include "base/macros.h" 13 #include "base/macros.h"
13 #include "base/memory/scoped_ptr.h"
14 #include "chrome/browser/ui/ash/launcher/launcher_favicon_loader.h" 14 #include "chrome/browser/ui/ash/launcher/launcher_favicon_loader.h"
15 #include "extensions/browser/app_window/app_window.h" 15 #include "extensions/browser/app_window/app_window.h"
16 16
17 class GURL; 17 class GURL;
18 18
19 namespace content { 19 namespace content {
20 class RenderViewHost; 20 class RenderViewHost;
21 } 21 }
22 22
23 namespace extensions { 23 namespace extensions {
(...skipping 28 matching lines...) Expand all
52 // LauncherFaviconLoader::Delegate overrides: 52 // LauncherFaviconLoader::Delegate overrides:
53 void FaviconUpdated() override; 53 void FaviconUpdated() override;
54 54
55 LauncherFaviconLoader* launcher_favicon_loader_for_test() { 55 LauncherFaviconLoader* launcher_favicon_loader_for_test() {
56 return launcher_favicon_loader_.get(); 56 return launcher_favicon_loader_.get();
57 } 57 }
58 58
59 private: 59 private:
60 extensions::AppWindow* host_; 60 extensions::AppWindow* host_;
61 GURL url_; 61 GURL url_;
62 scoped_ptr<content::WebContents> web_contents_; 62 std::unique_ptr<content::WebContents> web_contents_;
63 scoped_ptr<LauncherFaviconLoader> launcher_favicon_loader_; 63 std::unique_ptr<LauncherFaviconLoader> launcher_favicon_loader_;
64 64
65 DISALLOW_COPY_AND_ASSIGN(AshPanelContents); 65 DISALLOW_COPY_AND_ASSIGN(AshPanelContents);
66 }; 66 };
67 67
68 #endif // CHROME_BROWSER_EXTENSIONS_API_TABS_ASH_PANEL_CONTENTS_H_ 68 #endif // CHROME_BROWSER_EXTENSIONS_API_TABS_ASH_PANEL_CONTENTS_H_
OLDNEW
« no previous file with comments | « chrome/browser/extensions/api/tabs/app_window_controller.cc ('k') | chrome/browser/extensions/api/tabs/tabs_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698