OLD | NEW |
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 Loading... |
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_ |
OLD | NEW |