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

Side by Side Diff: components/web_view/public/cpp/web_view.cc

Issue 1674903003: Extract shell methods from ApplicationImpl into a base class, and pass this to Initialize() instead. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@mojom
Patch Set: . Created 4 years, 10 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
OLDNEW
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/web_view/public/cpp/web_view.h" 5 #include "components/web_view/public/cpp/web_view.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "components/mus/public/cpp/window.h" 11 #include "components/mus/public/cpp/window.h"
12 #include "mojo/shell/public/cpp/application_impl.h" 12 #include "mojo/shell/public/cpp/shell.h"
13 13
14 namespace web_view { 14 namespace web_view {
15 namespace { 15 namespace {
16 16
17 void OnEmbed(bool success, uint16_t connection_id) { 17 void OnEmbed(bool success, uint16_t connection_id) {
18 CHECK(success); 18 CHECK(success);
19 } 19 }
20 20
21 } // namespace 21 } // namespace
22 22
23 WebView::WebView(mojom::WebViewClient* client) : binding_(client) {} 23 WebView::WebView(mojom::WebViewClient* client) : binding_(client) {}
24 WebView::~WebView() {} 24 WebView::~WebView() {}
25 25
26 void WebView::Init(mojo::ApplicationImpl* app, mus::Window* window) { 26 void WebView::Init(mojo::Shell* shell, mus::Window* window) {
27 mojom::WebViewFactoryPtr factory; 27 mojom::WebViewFactoryPtr factory;
28 app->ConnectToService("mojo:web_view", &factory); 28 shell->ConnectToService("mojo:web_view", &factory);
29 factory->CreateWebView(binding_.CreateInterfacePtrAndBind(), 29 factory->CreateWebView(binding_.CreateInterfacePtrAndBind(),
30 GetProxy(&web_view_)); 30 GetProxy(&web_view_));
31 31
32 mus::mojom::WindowTreeClientPtr window_tree_client; 32 mus::mojom::WindowTreeClientPtr window_tree_client;
33 web_view_->GetWindowTreeClient(GetProxy(&window_tree_client)); 33 web_view_->GetWindowTreeClient(GetProxy(&window_tree_client));
34 window->Embed(std::move(window_tree_client), 34 window->Embed(std::move(window_tree_client),
35 mus::mojom::WindowTree::kAccessPolicyEmbedRoot, 35 mus::mojom::WindowTree::kAccessPolicyEmbedRoot,
36 base::Bind(&OnEmbed)); 36 base::Bind(&OnEmbed));
37 } 37 }
38 38
39 } // namespace web_view 39 } // namespace web_view
OLDNEW
« no previous file with comments | « components/web_view/public/cpp/web_view.h ('k') | components/web_view/test_frame_tree_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698