OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 "services/navigation/view_impl.h" | 5 #include "services/navigation/view_impl.h" |
6 | 6 |
7 #include "base/memory/ptr_util.h" | 7 #include "base/memory/ptr_util.h" |
8 #include "base/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" |
9 #include "content/public/browser/browser_context.h" | 9 #include "content/public/browser/browser_context.h" |
10 #include "content/public/browser/interstitial_page.h" | 10 #include "content/public/browser/interstitial_page.h" |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
45 | 45 |
46 // TODO(beng): Explicitly not writing a TypeConverter for this, and not doing a | 46 // TODO(beng): Explicitly not writing a TypeConverter for this, and not doing a |
47 // typemap just yet since I'm still figuring out what these | 47 // typemap just yet since I'm still figuring out what these |
48 // interfaces should take as parameters. | 48 // interfaces should take as parameters. |
49 mojom::NavigationEntryPtr EntryPtrFromNavEntry( | 49 mojom::NavigationEntryPtr EntryPtrFromNavEntry( |
50 const content::NavigationEntry& entry) { | 50 const content::NavigationEntry& entry) { |
51 mojom::NavigationEntryPtr entry_ptr(mojom::NavigationEntry::New()); | 51 mojom::NavigationEntryPtr entry_ptr(mojom::NavigationEntry::New()); |
52 entry_ptr->id = entry.GetUniqueID(); | 52 entry_ptr->id = entry.GetUniqueID(); |
53 entry_ptr->url = entry.GetURL(); | 53 entry_ptr->url = entry.GetURL(); |
54 entry_ptr->title = base::UTF16ToUTF8(entry.GetTitle()); | 54 entry_ptr->title = base::UTF16ToUTF8(entry.GetTitle()); |
55 entry_ptr->redirect_chain = entry.GetRedirectChain(); | 55 entry_ptr->redirect_chain = entry.GetMainFrameRedirectChain(); |
56 return entry_ptr; | 56 return entry_ptr; |
57 } | 57 } |
58 | 58 |
59 } // namespace | 59 } // namespace |
60 | 60 |
61 ViewImpl::ViewImpl(std::unique_ptr<shell::Connector> connector, | 61 ViewImpl::ViewImpl(std::unique_ptr<shell::Connector> connector, |
62 const std::string& client_user_id, | 62 const std::string& client_user_id, |
63 mojom::ViewClientPtr client, | 63 mojom::ViewClientPtr client, |
64 std::unique_ptr<shell::ServiceContextRef> ref) | 64 std::unique_ptr<shell::ServiceContextRef> ref) |
65 : connector_(std::move(connector)), | 65 : connector_(std::move(connector)), |
(...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
299 | 299 |
300 views::Widget* ViewImpl::GetWidget() { | 300 views::Widget* ViewImpl::GetWidget() { |
301 return web_view_->GetWidget(); | 301 return web_view_->GetWidget(); |
302 } | 302 } |
303 | 303 |
304 const views::Widget* ViewImpl::GetWidget() const { | 304 const views::Widget* ViewImpl::GetWidget() const { |
305 return web_view_->GetWidget(); | 305 return web_view_->GetWidget(); |
306 } | 306 } |
307 | 307 |
308 } // navigation | 308 } // navigation |
OLD | NEW |