Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(93)

Side by Side Diff: services/navigation/view_impl.cc

Issue 2493693003: Mojo C++ bindings: switch services/navigation mojom target to use STL types. (Closed)
Patch Set: Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « services/navigation/view_impl.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 108
109 void ViewImpl::Stop() { 109 void ViewImpl::Stop() {
110 web_view_->GetWebContents()->Stop(); 110 web_view_->GetWebContents()->Stop();
111 } 111 }
112 112
113 void ViewImpl::GetWindowTreeClient(ui::mojom::WindowTreeClientRequest request) { 113 void ViewImpl::GetWindowTreeClient(ui::mojom::WindowTreeClientRequest request) {
114 window_tree_client_ = 114 window_tree_client_ =
115 base::MakeUnique<ui::WindowTreeClient>(this, nullptr, std::move(request)); 115 base::MakeUnique<ui::WindowTreeClient>(this, nullptr, std::move(request));
116 } 116 }
117 117
118 void ViewImpl::ShowInterstitial(const mojo::String& html) { 118 void ViewImpl::ShowInterstitial(const std::string& html) {
119 content::InterstitialPage* interstitial = 119 content::InterstitialPage* interstitial =
120 content::InterstitialPage::Create(web_view_->GetWebContents(), 120 content::InterstitialPage::Create(web_view_->GetWebContents(),
121 false, 121 false,
122 GURL(), 122 GURL(),
123 new InterstitialPageDelegate(html)); 123 new InterstitialPageDelegate(html));
124 interstitial->Show(); 124 interstitial->Show();
125 } 125 }
126 126
127 void ViewImpl::HideInterstitial() { 127 void ViewImpl::HideInterstitial() {
128 // TODO(beng): this is not quite right. 128 // TODO(beng): this is not quite right.
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
288 288
289 views::Widget* ViewImpl::GetWidget() { 289 views::Widget* ViewImpl::GetWidget() {
290 return web_view_->GetWidget(); 290 return web_view_->GetWidget();
291 } 291 }
292 292
293 const views::Widget* ViewImpl::GetWidget() const { 293 const views::Widget* ViewImpl::GetWidget() const {
294 return web_view_->GetWidget(); 294 return web_view_->GetWidget();
295 } 295 }
296 296
297 } // navigation 297 } // navigation
OLDNEW
« no previous file with comments | « services/navigation/view_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698