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

Side by Side Diff: components/view_manager/display_manager.cc

Issue 1121783003: Move navigations with POST or referrer to the shell. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 5 years, 7 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/view_manager/display_manager.h" 5 #include "components/view_manager/display_manager.h"
6 6
7 #include "base/numerics/safe_conversions.h" 7 #include "base/numerics/safe_conversions.h"
8 #include "components/gpu/public/interfaces/gpu.mojom.h" 8 #include "components/gpu/public/interfaces/gpu.mojom.h"
9 #include "components/surfaces/public/interfaces/quads.mojom.h" 9 #include "components/surfaces/public/interfaces/quads.mojom.h"
10 #include "components/surfaces/public/interfaces/surfaces.mojom.h" 10 #include "components/surfaces/public/interfaces/surfaces.mojom.h"
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 weak_factory_(this) { 83 weak_factory_(this) {
84 metrics_.size = mojo::Size::New(); 84 metrics_.size = mojo::Size::New();
85 metrics_.size->width = 800; 85 metrics_.size->width = 800;
86 metrics_.size->height = 600; 86 metrics_.size->height = 600;
87 } 87 }
88 88
89 void DefaultDisplayManager::Init( 89 void DefaultDisplayManager::Init(
90 ConnectionManager* connection_manager, 90 ConnectionManager* connection_manager,
91 mojo::NativeViewportEventDispatcherPtr event_dispatcher) { 91 mojo::NativeViewportEventDispatcherPtr event_dispatcher) {
92 connection_manager_ = connection_manager; 92 connection_manager_ = connection_manager;
93 app_impl_->ConnectToService("mojo:native_viewport_service", 93 mojo::URLRequestPtr request(mojo::URLRequest::New());
94 request->url = mojo::String::From("mojo:native_viewport_service");
95 app_impl_->ConnectToService(request.Pass(),
94 &native_viewport_); 96 &native_viewport_);
95 native_viewport_.set_error_handler(this); 97 native_viewport_.set_error_handler(this);
96 native_viewport_->Create(metrics_.size->Clone(), 98 native_viewport_->Create(metrics_.size->Clone(),
97 base::Bind(&DefaultDisplayManager::OnMetricsChanged, 99 base::Bind(&DefaultDisplayManager::OnMetricsChanged,
98 weak_factory_.GetWeakPtr())); 100 weak_factory_.GetWeakPtr()));
99 native_viewport_->Show(); 101 native_viewport_->Show();
100 102
101 mojo::ContextProviderPtr context_provider; 103 mojo::ContextProviderPtr context_provider;
102 native_viewport_->GetContextProvider(GetProxy(&context_provider)); 104 native_viewport_->GetContextProvider(GetProxy(&context_provider));
103 mojo::DisplayFactoryPtr display_factory; 105 mojo::DisplayFactoryPtr display_factory;
104 app_impl_->ConnectToService("mojo:surfaces_service", &display_factory); 106 mojo::URLRequestPtr request2(mojo::URLRequest::New());
107 request2->url = mojo::String::From("mojo:surfaces_service");
108 app_impl_->ConnectToService(request2.Pass(), &display_factory);
105 display_factory->Create(context_provider.Pass(), 109 display_factory->Create(context_provider.Pass(),
106 nullptr, // returner - we never submit resources. 110 nullptr, // returner - we never submit resources.
107 GetProxy(&display_)); 111 GetProxy(&display_));
108 112
109 native_viewport_->SetEventDispatcher(event_dispatcher.Pass()); 113 native_viewport_->SetEventDispatcher(event_dispatcher.Pass());
110 } 114 }
111 115
112 DefaultDisplayManager::~DefaultDisplayManager() { 116 DefaultDisplayManager::~DefaultDisplayManager() {
113 } 117 }
114 118
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 &DefaultDisplayManager::OnMetricsChanged, weak_factory_.GetWeakPtr())); 178 &DefaultDisplayManager::OnMetricsChanged, weak_factory_.GetWeakPtr()));
175 } 179 }
176 180
177 void DefaultDisplayManager::OnConnectionError() { 181 void DefaultDisplayManager::OnConnectionError() {
178 // This is called when the native_viewport is torn down before 182 // This is called when the native_viewport is torn down before
179 // ~DefaultDisplayManager may be called. 183 // ~DefaultDisplayManager may be called.
180 native_viewport_closed_callback_.Run(); 184 native_viewport_closed_callback_.Run();
181 } 185 }
182 186
183 } // namespace view_manager 187 } // namespace view_manager
OLDNEW
« no previous file with comments | « components/view_manager/connection_manager_delegate.h ('k') | components/view_manager/public/cpp/lib/view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698