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

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

Issue 2187103002: services/ui: Remove unused connector argument (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix build errors Created 4 years, 4 months 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 | « mash/screenlock/screenlock.cc ('k') | services/ui/demo/mus_demo.cc » ('j') | 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/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "content/public/browser/browser_context.h" 8 #include "content/public/browser/browser_context.h"
9 #include "content/public/browser/interstitial_page.h" 9 #include "content/public/browser/interstitial_page.h"
10 #include "content/public/browser/interstitial_page_delegate.h" 10 #include "content/public/browser/interstitial_page_delegate.h"
(...skipping 256 matching lines...) Expand 10 before | Expand all | Expand 10 after
267 } 267 }
268 268
269 void ViewImpl::OnEmbed(ui::Window* root) { 269 void ViewImpl::OnEmbed(ui::Window* root) {
270 DCHECK(!widget_.get()); 270 DCHECK(!widget_.get());
271 widget_.reset(new views::Widget); 271 widget_.reset(new views::Widget);
272 views::Widget::InitParams params( 272 views::Widget::InitParams params(
273 views::Widget::InitParams::TYPE_WINDOW_FRAMELESS); 273 views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
274 params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET; 274 params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
275 params.delegate = this; 275 params.delegate = this;
276 params.native_widget = new views::NativeWidgetMus( 276 params.native_widget = new views::NativeWidgetMus(
277 widget_.get(), connector_.get(), root, ui::mojom::SurfaceType::DEFAULT); 277 widget_.get(), root, ui::mojom::SurfaceType::DEFAULT);
278 widget_->Init(params); 278 widget_->Init(params);
279 widget_->Show(); 279 widget_->Show();
280 } 280 }
281 281
282 void ViewImpl::OnDidDestroyClient(ui::WindowTreeClient* client) {} 282 void ViewImpl::OnDidDestroyClient(ui::WindowTreeClient* client) {}
283 void ViewImpl::OnEventObserved(const ui::Event& event, ui::Window* target) {} 283 void ViewImpl::OnEventObserved(const ui::Event& event, ui::Window* target) {}
284 284
285 views::View* ViewImpl::GetContentsView() { 285 views::View* ViewImpl::GetContentsView() {
286 return web_view_; 286 return web_view_;
287 } 287 }
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 | « mash/screenlock/screenlock.cc ('k') | services/ui/demo/mus_demo.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698