| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 <stdio.h> | 5 #include <stdio.h> |
| 6 #include <string> | 6 #include <string> |
| 7 | 7 |
| 8 #include "base/at_exit.h" | 8 #include "base/at_exit.h" |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/files/file_path.h" | 10 #include "base/files/file_path.h" |
| 11 #include "base/i18n/icu_util.h" | 11 #include "base/i18n/icu_util.h" |
| 12 #include "base/macros.h" | 12 #include "base/macros.h" |
| 13 #include "base/message_loop/message_loop.h" | 13 #include "base/message_loop/message_loop.h" |
| 14 #include "base/path_service.h" | 14 #include "base/path_service.h" |
| 15 #include "mojo/aura/screen_mojo.h" | 15 #include "mojo/aura/screen_mojo.h" |
| 16 #include "mojo/aura/window_tree_host_mojo.h" | 16 #include "mojo/aura/window_tree_host_mojo.h" |
| 17 #include "mojo/examples/launcher/launcher.mojom.h" | 17 #include "mojo/examples/launcher/launcher.mojom.h" |
| 18 #include "mojo/public/cpp/bindings/allocation_scope.h" | |
| 19 #include "mojo/public/cpp/gles2/gles2.h" | 18 #include "mojo/public/cpp/gles2/gles2.h" |
| 20 #include "mojo/public/cpp/shell/application.h" | 19 #include "mojo/public/cpp/shell/application.h" |
| 21 #include "mojo/public/cpp/system/core.h" | 20 #include "mojo/public/cpp/system/core.h" |
| 22 #include "mojo/public/interfaces/shell/shell.mojom.h" | 21 #include "mojo/public/interfaces/shell/shell.mojom.h" |
| 23 #include "mojo/services/native_viewport/native_viewport.mojom.h" | 22 #include "mojo/services/native_viewport/native_viewport.mojom.h" |
| 24 #include "ui/aura/client/aura_constants.h" | 23 #include "ui/aura/client/aura_constants.h" |
| 25 #include "ui/aura/client/default_capture_client.h" | 24 #include "ui/aura/client/default_capture_client.h" |
| 26 #include "ui/aura/client/window_tree_client.h" | 25 #include "ui/aura/client/window_tree_client.h" |
| 27 #include "ui/aura/env.h" | 26 #include "ui/aura/env.h" |
| 28 #include "ui/aura/test/test_focus_client.h" | 27 #include "ui/aura/test/test_focus_client.h" |
| (...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 217 return; | 216 return; |
| 218 } | 217 } |
| 219 window_tree_host_->Show(); | 218 window_tree_host_->Show(); |
| 220 } | 219 } |
| 221 virtual void Hide() OVERRIDE { | 220 virtual void Hide() OVERRIDE { |
| 222 window_tree_host_->Hide(); | 221 window_tree_host_->Hide(); |
| 223 } | 222 } |
| 224 | 223 |
| 225 // Overridden from URLReceiver: | 224 // Overridden from URLReceiver: |
| 226 virtual void OnURLEntered(const std::string& url_text) OVERRIDE { | 225 virtual void OnURLEntered(const std::string& url_text) OVERRIDE { |
| 227 AllocationScope scope; | 226 client()->OnURLEntered(String::From(url_text)); |
| 228 client()->OnURLEntered(url_text); | |
| 229 } | 227 } |
| 230 | 228 |
| 231 void HostContextCreated() { | 229 void HostContextCreated() { |
| 232 window_tree_host_->InitHost(); | 230 window_tree_host_->InitHost(); |
| 233 window_tree_host_->window()->SetBounds(gfx::Rect(450, 60)); | 231 window_tree_host_->window()->SetBounds(gfx::Rect(450, 60)); |
| 234 | 232 |
| 235 focus_client_.reset(new aura::test::TestFocusClient()); | 233 focus_client_.reset(new aura::test::TestFocusClient()); |
| 236 aura::client::SetFocusClient(window_tree_host_->window(), | 234 aura::client::SetFocusClient(window_tree_host_->window(), |
| 237 focus_client_.get()); | 235 focus_client_.get()); |
| 238 new wm::DefaultActivationClient(window_tree_host_->window()); | 236 new wm::DefaultActivationClient(window_tree_host_->window()); |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 287 // MessageLoop is not of TYPE_UI. I think we need a way to build | 285 // MessageLoop is not of TYPE_UI. I think we need a way to build |
| 288 // Aura that doesn't define platform-specific stuff. | 286 // Aura that doesn't define platform-specific stuff. |
| 289 aura::Env::CreateInstance(true); | 287 aura::Env::CreateInstance(true); |
| 290 | 288 |
| 291 mojo::Application app(shell_handle); | 289 mojo::Application app(shell_handle); |
| 292 app.AddService<mojo::examples::LauncherImpl>(&app); | 290 app.AddService<mojo::examples::LauncherImpl>(&app); |
| 293 | 291 |
| 294 loop.Run(); | 292 loop.Run(); |
| 295 return MOJO_RESULT_OK; | 293 return MOJO_RESULT_OK; |
| 296 } | 294 } |
| OLD | NEW |