| 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 185 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  214       return; |  213       return; | 
|  215     } |  214     } | 
|  216     window_tree_host_->Show(); |  215     window_tree_host_->Show(); | 
|  217   } |  216   } | 
|  218   virtual void Hide() OVERRIDE { |  217   virtual void Hide() OVERRIDE { | 
|  219     window_tree_host_->Hide(); |  218     window_tree_host_->Hide(); | 
|  220   } |  219   } | 
|  221  |  220  | 
|  222   // Overridden from URLReceiver: |  221   // Overridden from URLReceiver: | 
|  223   virtual void OnURLEntered(const std::string& url_text) OVERRIDE { |  222   virtual void OnURLEntered(const std::string& url_text) OVERRIDE { | 
|  224     AllocationScope scope; |  223     client()->OnURLEntered(String::From(url_text)); | 
|  225     client()->OnURLEntered(url_text); |  | 
|  226   } |  224   } | 
|  227  |  225  | 
|  228   void HostContextCreated() { |  226   void HostContextCreated() { | 
|  229     window_tree_host_->InitHost(); |  227     window_tree_host_->InitHost(); | 
|  230     window_tree_host_->window()->SetBounds(gfx::Rect(450, 60)); |  228     window_tree_host_->window()->SetBounds(gfx::Rect(450, 60)); | 
|  231  |  229  | 
|  232     focus_client_.reset(new aura::test::TestFocusClient()); |  230     focus_client_.reset(new aura::test::TestFocusClient()); | 
|  233     aura::client::SetFocusClient(window_tree_host_->window(), |  231     aura::client::SetFocusClient(window_tree_host_->window(), | 
|  234                                  focus_client_.get()); |  232                                  focus_client_.get()); | 
|  235     new wm::DefaultActivationClient(window_tree_host_->window()); |  233     new wm::DefaultActivationClient(window_tree_host_->window()); | 
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  284   //             MessageLoop is not of TYPE_UI. I think we need a way to build |  282   //             MessageLoop is not of TYPE_UI. I think we need a way to build | 
|  285   //             Aura that doesn't define platform-specific stuff. |  283   //             Aura that doesn't define platform-specific stuff. | 
|  286   aura::Env::CreateInstance(true); |  284   aura::Env::CreateInstance(true); | 
|  287  |  285  | 
|  288   mojo::Application app(shell_handle); |  286   mojo::Application app(shell_handle); | 
|  289   app.AddService<mojo::examples::LauncherImpl>(&app); |  287   app.AddService<mojo::examples::LauncherImpl>(&app); | 
|  290  |  288  | 
|  291   loop.Run(); |  289   loop.Run(); | 
|  292   return MOJO_RESULT_OK; |  290   return MOJO_RESULT_OK; | 
|  293 } |  291 } | 
| OLD | NEW |