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

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

Issue 2131493002: ShellConnection -> ServiceContext (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@st
Patch Set: . Created 4 years, 5 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 | « services/navigation/view_impl.h ('k') | services/shell/background/background_shell.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 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 entry_ptr->redirect_chain = entry.GetRedirectChain(); 53 entry_ptr->redirect_chain = entry.GetRedirectChain();
54 return entry_ptr; 54 return entry_ptr;
55 } 55 }
56 56
57 } // namespace 57 } // namespace
58 58
59 ViewImpl::ViewImpl(shell::Connector* connector, 59 ViewImpl::ViewImpl(shell::Connector* connector,
60 const std::string& client_user_id, 60 const std::string& client_user_id,
61 mojom::ViewClientPtr client, 61 mojom::ViewClientPtr client,
62 mojom::ViewRequest request, 62 mojom::ViewRequest request,
63 std::unique_ptr<shell::ShellConnectionRef> ref) 63 std::unique_ptr<shell::ServiceContextRef> ref)
64 : connector_(connector), 64 : connector_(connector),
65 binding_(this, std::move(request)), 65 binding_(this, std::move(request)),
66 client_(std::move(client)), 66 client_(std::move(client)),
67 ref_(std::move(ref)), 67 ref_(std::move(ref)),
68 web_view_(new views::WebView( 68 web_view_(new views::WebView(
69 content::BrowserContext::GetBrowserContextForShellUserId( 69 content::BrowserContext::GetBrowserContextForShellUserId(
70 client_user_id))) { 70 client_user_id))) {
71 web_view_->GetWebContents()->SetDelegate(this); 71 web_view_->GetWebContents()->SetDelegate(this);
72 const content::NavigationController* controller = 72 const content::NavigationController* controller =
73 &web_view_->GetWebContents()->GetController(); 73 &web_view_->GetWebContents()->GetController();
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after
286 286
287 views::Widget* ViewImpl::GetWidget() { 287 views::Widget* ViewImpl::GetWidget() {
288 return web_view_->GetWidget(); 288 return web_view_->GetWidget();
289 } 289 }
290 290
291 const views::Widget* ViewImpl::GetWidget() const { 291 const views::Widget* ViewImpl::GetWidget() const {
292 return web_view_->GetWidget(); 292 return web_view_->GetWidget();
293 } 293 }
294 294
295 } // navigation 295 } // navigation
OLDNEW
« no previous file with comments | « services/navigation/view_impl.h ('k') | services/shell/background/background_shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698