| OLD | NEW | 
|   1 // Copyright 2016 The Chromium Authors. All rights reserved. |   1 // Copyright 2016 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 #ifndef ASH_TOUCH_HUD_MUS_TOUCH_HUD_APPLICATION_H_ |   5 #ifndef ASH_TOUCH_HUD_MUS_TOUCH_HUD_APPLICATION_H_ | 
|   6 #define ASH_TOUCH_HUD_MUS_TOUCH_HUD_APPLICATION_H_ |   6 #define ASH_TOUCH_HUD_MUS_TOUCH_HUD_APPLICATION_H_ | 
|   7  |   7  | 
|   8 #include <map> |   8 #include <map> | 
|   9  |   9  | 
|  10 #include "base/macros.h" |  10 #include "base/macros.h" | 
|  11 #include "mash/public/interfaces/launchable.mojom.h" |  11 #include "mash/public/interfaces/launchable.mojom.h" | 
|  12 #include "mojo/public/cpp/bindings/binding.h" |  12 #include "mojo/public/cpp/bindings/binding.h" | 
|  13 #include "services/shell/public/cpp/service.h" |  13 #include "services/service_manager/public/cpp/service.h" | 
|  14  |  14  | 
|  15 namespace views { |  15 namespace views { | 
|  16 class AuraInit; |  16 class AuraInit; | 
|  17 class Widget; |  17 class Widget; | 
|  18 class WindowManagerConnection; |  18 class WindowManagerConnection; | 
|  19 } |  19 } | 
|  20  |  20  | 
|  21 namespace ash { |  21 namespace ash { | 
|  22 namespace touch_hud { |  22 namespace touch_hud { | 
|  23  |  23  | 
| (...skipping 24 matching lines...) Expand all  Loading... | 
|  48   std::unique_ptr<views::AuraInit> aura_init_; |  48   std::unique_ptr<views::AuraInit> aura_init_; | 
|  49   std::unique_ptr<views::WindowManagerConnection> window_manager_connection_; |  49   std::unique_ptr<views::WindowManagerConnection> window_manager_connection_; | 
|  50  |  50  | 
|  51   DISALLOW_COPY_AND_ASSIGN(TouchHudApplication); |  51   DISALLOW_COPY_AND_ASSIGN(TouchHudApplication); | 
|  52 }; |  52 }; | 
|  53  |  53  | 
|  54 }  // namespace touch_hud |  54 }  // namespace touch_hud | 
|  55 }  // namespace ash |  55 }  // namespace ash | 
|  56  |  56  | 
|  57 #endif  // ASH_TOUCH_HUD_MUS_TOUCH_HUD_APPLICATION_H_ |  57 #endif  // ASH_TOUCH_HUD_MUS_TOUCH_HUD_APPLICATION_H_ | 
| OLD | NEW |