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 <vector> | 10 #include <vector> |
(...skipping 19 matching lines...) Expand all Loading... |
30 // an extensions::WindowController instance for interfacing with the v1 | 30 // an extensions::WindowController instance for interfacing with the v1 |
31 // extensions API. | 31 // extensions API. |
32 class AshPanelContents | 32 class AshPanelContents |
33 : public extensions::AppWindowContents, | 33 : public extensions::AppWindowContents, |
34 public LauncherFaviconLoader::Delegate { | 34 public LauncherFaviconLoader::Delegate { |
35 public: | 35 public: |
36 explicit AshPanelContents(extensions::AppWindow* host); | 36 explicit AshPanelContents(extensions::AppWindow* host); |
37 ~AshPanelContents() override; | 37 ~AshPanelContents() override; |
38 | 38 |
39 // extensions::AppWindowContents | 39 // extensions::AppWindowContents |
40 void Initialize(content::BrowserContext* context, const GURL& url) override; | 40 void Initialize(content::BrowserContext* context, |
| 41 content::RenderFrameHost* creator_frame, |
| 42 const GURL& url) override; |
41 void LoadContents(int32_t creator_process_id) override; | 43 void LoadContents(int32_t creator_process_id) override; |
42 void NativeWindowChanged( | 44 void NativeWindowChanged( |
43 extensions::NativeAppWindow* native_app_window) override; | 45 extensions::NativeAppWindow* native_app_window) override; |
44 void NativeWindowClosed() override; | 46 void NativeWindowClosed() override; |
45 void DispatchWindowShownForTests() const override; | 47 void DispatchWindowShownForTests() const override; |
46 void OnWindowReady() override; | 48 void OnWindowReady() override; |
47 content::WebContents* GetWebContents() const override; | 49 content::WebContents* GetWebContents() const override; |
48 extensions::WindowController* GetWindowController() const override; | 50 extensions::WindowController* GetWindowController() const override; |
49 | 51 |
50 // LauncherFaviconLoader::Delegate overrides: | 52 // LauncherFaviconLoader::Delegate overrides: |
51 void FaviconUpdated() override; | 53 void FaviconUpdated() override; |
52 | 54 |
53 LauncherFaviconLoader* launcher_favicon_loader_for_test() { | 55 LauncherFaviconLoader* launcher_favicon_loader_for_test() { |
54 return launcher_favicon_loader_.get(); | 56 return launcher_favicon_loader_.get(); |
55 } | 57 } |
56 | 58 |
57 private: | 59 private: |
58 extensions::AppWindow* host_; | 60 extensions::AppWindow* host_; |
59 GURL url_; | 61 GURL url_; |
60 scoped_ptr<content::WebContents> web_contents_; | 62 scoped_ptr<content::WebContents> web_contents_; |
61 scoped_ptr<LauncherFaviconLoader> launcher_favicon_loader_; | 63 scoped_ptr<LauncherFaviconLoader> launcher_favicon_loader_; |
62 | 64 |
63 DISALLOW_COPY_AND_ASSIGN(AshPanelContents); | 65 DISALLOW_COPY_AND_ASSIGN(AshPanelContents); |
64 }; | 66 }; |
65 | 67 |
66 #endif // CHROME_BROWSER_EXTENSIONS_API_TABS_ASH_PANEL_CONTENTS_H_ | 68 #endif // CHROME_BROWSER_EXTENSIONS_API_TABS_ASH_PANEL_CONTENTS_H_ |
OLD | NEW |