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

Side by Side Diff: components/html_viewer/global_state.cc

Issue 1473273003: Mojo C++ bindings: InterfacePtr<T> and Binding<T> use MultiplexRouter when T passes associated inte… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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 | « no previous file | mandoline/services/core_services/core_services_application_delegate.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 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/html_viewer/global_state.h" 5 #include "components/html_viewer/global_state.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 if (command_line->HasSwitch("single-process")) 148 if (command_line->HasSwitch("single-process"))
149 initialize_ui = false; 149 initialize_ui = false;
150 #endif 150 #endif
151 if (initialize_ui) { 151 if (initialize_ui) {
152 ui::RegisterPathProvider(); 152 ui::RegisterPathProvider();
153 base::File pak_file_2 = pak_file.Duplicate(); 153 base::File pak_file_2 = pak_file.Duplicate();
154 ui::ResourceBundle::InitSharedInstanceWithPakFileRegion( 154 ui::ResourceBundle::InitSharedInstanceWithPakFileRegion(
155 pak_file_2.Pass(), base::MemoryMappedFile::Region::kWholeFile); 155 pak_file_2.Pass(), base::MemoryMappedFile::Region::kWholeFile);
156 } 156 }
157 157
158 mojo::logging::InitLogging(); 158 mojo::InitLogging();
159 159
160 if (command_line->HasSwitch(kDisableEncryptedMedia)) 160 if (command_line->HasSwitch(kDisableEncryptedMedia))
161 blink::WebRuntimeFeatures::enableEncryptedMedia(false); 161 blink::WebRuntimeFeatures::enableEncryptedMedia(false);
162 162
163 blink_settings_->Init(); 163 blink_settings_->Init();
164 164
165 // TODO(sky): why is this always using 100? 165 // TODO(sky): why is this always using 100?
166 ui::ResourceBundle::GetSharedInstance().AddDataPackFromFile( 166 ui::ResourceBundle::GetSharedInstance().AddDataPackFromFile(
167 pak_file.Pass(), ui::SCALE_FACTOR_100P); 167 pak_file.Pass(), ui::SCALE_FACTOR_100P);
168 168
(...skipping 16 matching lines...) Expand all
185 return gpu_info_.get(); 185 return gpu_info_.get();
186 } 186 }
187 187
188 void GlobalState::GetGpuInfoCallback(mus::mojom::GpuInfoPtr gpu_info) { 188 void GlobalState::GetGpuInfoCallback(mus::mojom::GpuInfoPtr gpu_info) {
189 CHECK(gpu_info); 189 CHECK(gpu_info);
190 gpu_info_ = gpu_info.Pass(); 190 gpu_info_ = gpu_info.Pass();
191 gpu_service_.reset(); 191 gpu_service_.reset();
192 } 192 }
193 193
194 } // namespace html_viewer 194 } // namespace html_viewer
OLDNEW
« no previous file with comments | « no previous file | mandoline/services/core_services/core_services_application_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698