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

Side by Side Diff: mojo/examples/browser/browser.cc

Issue 668483002: Change mojo URLs from mojo://mojo_foo to mojo://foo. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 years, 2 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 "base/macros.h" 5 #include "base/macros.h"
6 #include "base/strings/string_util.h" 6 #include "base/strings/string_util.h"
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "mojo/application/application_runner_chromium.h" 8 #include "mojo/application/application_runner_chromium.h"
9 #include "mojo/common/common_type_converters.h" 9 #include "mojo/common/common_type_converters.h"
10 #include "mojo/converters/geometry/geometry_type_converters.h" 10 #include "mojo/converters/geometry/geometry_type_converters.h"
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 root_->RemoveObserver(this); 162 root_->RemoveObserver(this);
163 } 163 }
164 164
165 private: 165 private:
166 // Overridden from ApplicationDelegate: 166 // Overridden from ApplicationDelegate:
167 virtual void Initialize(ApplicationImpl* app) override { 167 virtual void Initialize(ApplicationImpl* app) override {
168 shell_ = app->shell(); 168 shell_ = app->shell();
169 view_manager_client_factory_.reset( 169 view_manager_client_factory_.reset(
170 new ViewManagerClientFactory(shell_, this)); 170 new ViewManagerClientFactory(shell_, this));
171 views_init_.reset(new ViewsInit); 171 views_init_.reset(new ViewsInit);
172 app->ConnectToService("mojo:mojo_window_manager", &window_manager_); 172 app->ConnectToService("mojo:window_manager", &window_manager_);
173 } 173 }
174 174
175 virtual bool ConfigureIncomingConnection( 175 virtual bool ConfigureIncomingConnection(
176 ApplicationConnection* connection) override { 176 ApplicationConnection* connection) override {
177 connection->AddService(view_manager_client_factory_.get()); 177 connection->AddService(view_manager_client_factory_.get());
178 return true; 178 return true;
179 } 179 }
180 180
181 void CreateWidget(View* view) { 181 void CreateWidget(View* view) {
182 views::Textfield* textfield = new views::Textfield; 182 views::Textfield* textfield = new views::Textfield;
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
265 DISALLOW_COPY_AND_ASSIGN(Browser); 265 DISALLOW_COPY_AND_ASSIGN(Browser);
266 }; 266 };
267 267
268 } // namespace examples 268 } // namespace examples
269 } // namespace mojo 269 } // namespace mojo
270 270
271 MojoResult MojoMain(MojoHandle shell_handle) { 271 MojoResult MojoMain(MojoHandle shell_handle) {
272 mojo::ApplicationRunnerChromium runner(new mojo::examples::Browser); 272 mojo::ApplicationRunnerChromium runner(new mojo::examples::Browser);
273 return runner.Run(shell_handle); 273 return runner.Run(shell_handle);
274 } 274 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698