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

Side by Side Diff: components/kiosk_wm/kiosk_wm.h

Issue 1085233004: Moves services implementations out of third_party/mojo_services (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: unnecessary changes Created 5 years, 8 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 #ifndef COMPONENTS_KIOSK_WM_KIOSK_WM_H_ 5 #ifndef COMPONENTS_KIOSK_WM_KIOSK_WM_H_
6 #define COMPONENTS_KIOSK_WM_KIOSK_WM_H_ 6 #define COMPONENTS_KIOSK_WM_KIOSK_WM_H_
7 7
8 #include "base/memory/weak_ptr.h" 8 #include "base/memory/weak_ptr.h"
9 #include "components/kiosk_wm/navigator_host_impl.h" 9 #include "components/kiosk_wm/navigator_host_impl.h"
10 #include "components/view_manager/public/cpp/view_manager.h"
11 #include "components/view_manager/public/cpp/view_manager_delegate.h"
12 #include "components/view_manager/public/cpp/view_observer.h"
10 #include "components/window_manager/window_manager_app.h" 13 #include "components/window_manager/window_manager_app.h"
11 #include "components/window_manager/window_manager_delegate.h" 14 #include "components/window_manager/window_manager_delegate.h"
12 #include "third_party/mojo/src/mojo/public/cpp/application/application_delegate. h" 15 #include "third_party/mojo/src/mojo/public/cpp/application/application_delegate. h"
13 #include "third_party/mojo/src/mojo/public/cpp/application/application_impl.h" 16 #include "third_party/mojo/src/mojo/public/cpp/application/application_impl.h"
14 #include "third_party/mojo/src/mojo/public/cpp/application/connect.h" 17 #include "third_party/mojo/src/mojo/public/cpp/application/connect.h"
15 #include "third_party/mojo/src/mojo/public/cpp/application/service_provider_impl .h" 18 #include "third_party/mojo/src/mojo/public/cpp/application/service_provider_impl .h"
16 #include "third_party/mojo_services/src/input_events/public/interfaces/input_eve nts.mojom.h"
17 #include "third_party/mojo_services/src/navigation/public/interfaces/navigation. mojom.h" 19 #include "third_party/mojo_services/src/navigation/public/interfaces/navigation. mojom.h"
18 #include "third_party/mojo_services/src/view_manager/public/cpp/view_manager.h"
19 #include "third_party/mojo_services/src/view_manager/public/cpp/view_manager_del egate.h"
20 #include "third_party/mojo_services/src/view_manager/public/cpp/view_observer.h"
21 #include "ui/base/accelerators/accelerator.h" 20 #include "ui/base/accelerators/accelerator.h"
21 #include "ui/mojo/events/input_events.mojom.h"
22 22
23 namespace kiosk_wm { 23 namespace kiosk_wm {
24 24
25 class MergedServiceProvider; 25 class MergedServiceProvider;
26 26
27 class KioskWM : public mojo::ApplicationDelegate, 27 class KioskWM : public mojo::ApplicationDelegate,
28 public mojo::ViewManagerDelegate, 28 public mojo::ViewManagerDelegate,
29 public mojo::ViewObserver, 29 public mojo::ViewObserver,
30 public window_manager::WindowManagerDelegate, 30 public window_manager::WindowManagerDelegate,
31 public mojo::InterfaceFactory<mojo::NavigatorHost>, 31 public mojo::InterfaceFactory<mojo::NavigatorHost>,
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 NavigatorHostImpl navigator_host_; 86 NavigatorHostImpl navigator_host_;
87 87
88 base::WeakPtrFactory<KioskWM> weak_factory_; 88 base::WeakPtrFactory<KioskWM> weak_factory_;
89 89
90 DISALLOW_COPY_AND_ASSIGN(KioskWM); 90 DISALLOW_COPY_AND_ASSIGN(KioskWM);
91 }; 91 };
92 92
93 } // namespace kiosk_wm 93 } // namespace kiosk_wm
94 94
95 #endif // COMPONENTS_KIOSK_WM_KIOSK_WM_H_ 95 #endif // COMPONENTS_KIOSK_WM_KIOSK_WM_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698