OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 #include "components/sessions/content/content_live_tab.h" | 5 #include "components/sessions/content/content_live_tab.h" |
| 6 |
| 7 #include "base/memory/ptr_util.h" |
6 #include "components/sessions/content/content_platform_specific_tab_data.h" | 8 #include "components/sessions/content/content_platform_specific_tab_data.h" |
7 | 9 |
8 namespace { | 10 namespace { |
9 const char kContentLiveTabWebContentsUserDataKey[] = "content_live_tab"; | 11 const char kContentLiveTabWebContentsUserDataKey[] = "content_live_tab"; |
10 } | 12 } |
11 | 13 |
12 namespace sessions { | 14 namespace sessions { |
13 | 15 |
14 // static | 16 // static |
15 ContentLiveTab* ContentLiveTab::GetForWebContents( | 17 ContentLiveTab* ContentLiveTab::GetForWebContents( |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
47 | 49 |
48 sessions::SerializedNavigationEntry ContentLiveTab::GetPendingEntry() { | 50 sessions::SerializedNavigationEntry ContentLiveTab::GetPendingEntry() { |
49 return sessions::ContentSerializedNavigationBuilder::FromNavigationEntry( | 51 return sessions::ContentSerializedNavigationBuilder::FromNavigationEntry( |
50 GetPendingEntryIndex(), *navigation_controller().GetPendingEntry()); | 52 GetPendingEntryIndex(), *navigation_controller().GetPendingEntry()); |
51 } | 53 } |
52 | 54 |
53 int ContentLiveTab::GetEntryCount() { | 55 int ContentLiveTab::GetEntryCount() { |
54 return navigation_controller().GetEntryCount(); | 56 return navigation_controller().GetEntryCount(); |
55 } | 57 } |
56 | 58 |
57 scoped_ptr<sessions::PlatformSpecificTabData> | 59 std::unique_ptr<sessions::PlatformSpecificTabData> |
58 ContentLiveTab::GetPlatformSpecificTabData() { | 60 ContentLiveTab::GetPlatformSpecificTabData() { |
59 return make_scoped_ptr( | 61 return base::WrapUnique( |
60 new sessions::ContentPlatformSpecificTabData(web_contents())); | 62 new sessions::ContentPlatformSpecificTabData(web_contents())); |
61 } | 63 } |
62 | 64 |
63 void ContentLiveTab::LoadIfNecessary() { | 65 void ContentLiveTab::LoadIfNecessary() { |
64 navigation_controller().LoadIfNecessary(); | 66 navigation_controller().LoadIfNecessary(); |
65 } | 67 } |
66 | 68 |
67 const std::string& ContentLiveTab::GetUserAgentOverride() const { | 69 const std::string& ContentLiveTab::GetUserAgentOverride() const { |
68 return web_contents()->GetUserAgentOverride(); | 70 return web_contents()->GetUserAgentOverride(); |
69 } | 71 } |
70 | 72 |
71 } // namespace sessions | 73 } // namespace sessions |
OLD | NEW |