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 EXTENSIONS_BROWSER_APP_WINDOW_APP_WINDOW_CONTENTS_H_ | 5 #ifndef EXTENSIONS_BROWSER_APP_WINDOW_APP_WINDOW_CONTENTS_H_ |
6 #define EXTENSIONS_BROWSER_APP_WINDOW_APP_WINDOW_CONTENTS_H_ | 6 #define EXTENSIONS_BROWSER_APP_WINDOW_APP_WINDOW_CONTENTS_H_ |
7 | 7 |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
| 10 #include <memory> |
| 11 |
10 #include "base/macros.h" | 12 #include "base/macros.h" |
11 #include "base/memory/scoped_ptr.h" | |
12 #include "content/public/browser/web_contents_observer.h" | 13 #include "content/public/browser/web_contents_observer.h" |
13 #include "extensions/browser/app_window/app_window.h" | 14 #include "extensions/browser/app_window/app_window.h" |
14 #include "url/gurl.h" | 15 #include "url/gurl.h" |
15 | 16 |
16 namespace content { | 17 namespace content { |
17 class BrowserContext; | 18 class BrowserContext; |
18 class RenderFrameHost; | 19 class RenderFrameHost; |
19 } | 20 } |
20 | 21 |
21 namespace extensions { | 22 namespace extensions { |
(...skipping 24 matching lines...) Expand all Loading... |
46 private: | 47 private: |
47 // content::WebContentsObserver | 48 // content::WebContentsObserver |
48 bool OnMessageReceived(const IPC::Message& message) override; | 49 bool OnMessageReceived(const IPC::Message& message) override; |
49 void ReadyToCommitNavigation(content::NavigationHandle* handle) override; | 50 void ReadyToCommitNavigation(content::NavigationHandle* handle) override; |
50 | 51 |
51 void UpdateDraggableRegions(const std::vector<DraggableRegion>& regions); | 52 void UpdateDraggableRegions(const std::vector<DraggableRegion>& regions); |
52 void SuspendRenderFrameHost(content::RenderFrameHost* rfh); | 53 void SuspendRenderFrameHost(content::RenderFrameHost* rfh); |
53 | 54 |
54 AppWindow* host_; // This class is owned by |host_| | 55 AppWindow* host_; // This class is owned by |host_| |
55 GURL url_; | 56 GURL url_; |
56 scoped_ptr<content::WebContents> web_contents_; | 57 std::unique_ptr<content::WebContents> web_contents_; |
57 bool is_blocking_requests_; | 58 bool is_blocking_requests_; |
58 bool is_window_ready_; | 59 bool is_window_ready_; |
59 | 60 |
60 DISALLOW_COPY_AND_ASSIGN(AppWindowContentsImpl); | 61 DISALLOW_COPY_AND_ASSIGN(AppWindowContentsImpl); |
61 }; | 62 }; |
62 | 63 |
63 } // namespace extensions | 64 } // namespace extensions |
64 | 65 |
65 #endif // EXTENSIONS_BROWSER_APP_WINDOW_APP_WINDOW_CONTENTS_H_ | 66 #endif // EXTENSIONS_BROWSER_APP_WINDOW_APP_WINDOW_CONTENTS_H_ |
OLD | NEW |