OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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_FRAME_CONTENTS_WEB_VIEW_H_ | 5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_CONTENTS_WEB_VIEW_H_ |
6 #define CHROME_BROWSER_UI_VIEWS_FRAME_CONTENTS_WEB_VIEW_H_ | 6 #define CHROME_BROWSER_UI_VIEWS_FRAME_CONTENTS_WEB_VIEW_H_ |
7 | 7 |
| 8 #include <memory> |
| 9 |
8 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
9 #include "base/macros.h" | 11 #include "base/macros.h" |
10 #include "base/memory/scoped_ptr.h" | |
11 #include "chrome/browser/ui/views/frame/web_contents_close_handler_delegate.h" | 12 #include "chrome/browser/ui/views/frame/web_contents_close_handler_delegate.h" |
12 #include "ui/compositor/layer_owner_delegate.h" | 13 #include "ui/compositor/layer_owner_delegate.h" |
13 #include "ui/views/controls/webview/webview.h" | 14 #include "ui/views/controls/webview/webview.h" |
14 | 15 |
15 class StatusBubbleViews; | 16 class StatusBubbleViews; |
16 | 17 |
17 namespace ui { | 18 namespace ui { |
18 class LayerTreeOwner; | 19 class LayerTreeOwner; |
19 } | 20 } |
20 | 21 |
(...skipping 20 matching lines...) Expand all Loading... |
41 // ui::LayerOwnerDelegate overrides: | 42 // ui::LayerOwnerDelegate overrides: |
42 void OnLayerRecreated(ui::Layer* old_layer, ui::Layer* new_layer) override; | 43 void OnLayerRecreated(ui::Layer* old_layer, ui::Layer* new_layer) override; |
43 | 44 |
44 // WebContentsCloseHandlerDelegate overrides: | 45 // WebContentsCloseHandlerDelegate overrides: |
45 void CloneWebContentsLayer() override; | 46 void CloneWebContentsLayer() override; |
46 void DestroyClonedLayer() override; | 47 void DestroyClonedLayer() override; |
47 | 48 |
48 private: | 49 private: |
49 StatusBubbleViews* status_bubble_; | 50 StatusBubbleViews* status_bubble_; |
50 | 51 |
51 scoped_ptr<ui::LayerTreeOwner> cloned_layer_tree_; | 52 std::unique_ptr<ui::LayerTreeOwner> cloned_layer_tree_; |
52 | 53 |
53 DISALLOW_COPY_AND_ASSIGN(ContentsWebView); | 54 DISALLOW_COPY_AND_ASSIGN(ContentsWebView); |
54 }; | 55 }; |
55 | 56 |
56 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_CONTENTS_WEB_VIEW_H_ | 57 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_CONTENTS_WEB_VIEW_H_ |
OLD | NEW |