| OLD | NEW | 
|    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/basictypes.h" |    5 #include "base/basictypes.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/examples/keyboard/keyboard.mojom.h" |    9 #include "mojo/examples/keyboard/keyboard.mojom.h" | 
|   10 #include "mojo/examples/keyboard/keyboard_delegate.h" |   10 #include "mojo/examples/keyboard/keyboard_delegate.h" | 
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|   60   } |   60   } | 
|   61  |   61  | 
|   62   void set_target(Id id) { target_ = id; } |   62   void set_target(Id id) { target_ = id; } | 
|   63  |   63  | 
|   64   void set_keyboard_service(KeyboardServiceImpl* keyboard) { |   64   void set_keyboard_service(KeyboardServiceImpl* keyboard) { | 
|   65     keyboard_service_ = keyboard; |   65     keyboard_service_ = keyboard; | 
|   66   } |   66   } | 
|   67  |   67  | 
|   68  private: |   68  private: | 
|   69   // Overridden from ApplicationDelegate: |   69   // Overridden from ApplicationDelegate: | 
|   70   virtual void Initialize(ApplicationImpl* app) MOJO_OVERRIDE { |   70   virtual void Initialize(ApplicationImpl* app) override { | 
|   71     view_manager_client_factory_.reset( |   71     view_manager_client_factory_.reset( | 
|   72         new ViewManagerClientFactory(app->shell(), this)); |   72         new ViewManagerClientFactory(app->shell(), this)); | 
|   73   } |   73   } | 
|   74  |   74  | 
|   75   virtual bool ConfigureIncomingConnection(ApplicationConnection* connection) |   75   virtual bool ConfigureIncomingConnection( | 
|   76       MOJO_OVERRIDE { |   76       ApplicationConnection* connection) override { | 
|   77     views_init_.reset(new ViewsInit); |   77     views_init_.reset(new ViewsInit); | 
|   78     connection->AddService(view_manager_client_factory_.get()); |   78     connection->AddService(view_manager_client_factory_.get()); | 
|   79     connection->AddService(&keyboard_service_factory_); |   79     connection->AddService(&keyboard_service_factory_); | 
|   80     return true; |   80     return true; | 
|   81   } |   81   } | 
|   82  |   82  | 
|   83   void CreateWidget(View* view) { |   83   void CreateWidget(View* view) { | 
|   84     views::WidgetDelegateView* widget_delegate = new views::WidgetDelegateView; |   84     views::WidgetDelegateView* widget_delegate = new views::WidgetDelegateView; | 
|   85     widget_delegate->GetContentsView()->AddChildView(new KeyboardView(this)); |   85     widget_delegate->GetContentsView()->AddChildView(new KeyboardView(this)); | 
|   86     widget_delegate->GetContentsView()->SetLayoutManager(new views::FillLayout); |   86     widget_delegate->GetContentsView()->SetLayoutManager(new views::FillLayout); | 
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  143   keyboard_->set_target(view_id); |  143   keyboard_->set_target(view_id); | 
|  144 } |  144 } | 
|  145  |  145  | 
|  146 }  // namespace examples |  146 }  // namespace examples | 
|  147 }  // namespace mojo |  147 }  // namespace mojo | 
|  148  |  148  | 
|  149 MojoResult MojoMain(MojoHandle shell_handle) { |  149 MojoResult MojoMain(MojoHandle shell_handle) { | 
|  150   mojo::ApplicationRunnerChromium runner(new mojo::examples::Keyboard); |  150   mojo::ApplicationRunnerChromium runner(new mojo::examples::Keyboard); | 
|  151   return runner.Run(shell_handle); |  151   return runner.Run(shell_handle); | 
|  152 } |  152 } | 
| OLD | NEW |