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

Side by Side Diff: chrome/browser/chromeos/chrome_browser_main_chromeos.h

Issue 1408263006: chromeos: Add ArcInputBridge to components/arc (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@arcxx
Patch Set: fixed scopedfd Created 5 years, 1 month 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 CHROME_BROWSER_CHROMEOS_CHROME_BROWSER_MAIN_CHROMEOS_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_CHROME_BROWSER_MAIN_CHROMEOS_H_
6 #define CHROME_BROWSER_CHROMEOS_CHROME_BROWSER_MAIN_CHROMEOS_H_ 6 #define CHROME_BROWSER_CHROMEOS_CHROME_BROWSER_MAIN_CHROMEOS_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/task/cancelable_task_tracker.h" 9 #include "base/task/cancelable_task_tracker.h"
10 #include "chrome/browser/chrome_browser_main_linux.h" 10 #include "chrome/browser/chrome_browser_main_linux.h"
11 #include "chrome/browser/chromeos/external_metrics.h" 11 #include "chrome/browser/chromeos/external_metrics.h"
12 #include "chromeos/system/version_loader.h" 12 #include "chromeos/system/version_loader.h"
13 13
14 namespace session_manager { 14 namespace session_manager {
15 class SessionManager; 15 class SessionManager;
16 } 16 }
17 17
18 #if defined(ENABLE_ARC) 18 #if defined(ENABLE_ARC)
19 namespace arc { 19 namespace arc {
20 class ArcBridgeService; 20 class ArcBridgeService;
21 class ArcInputBridge;
21 } 22 }
22 #endif 23 #endif
23 24
24 namespace chromeos { 25 namespace chromeos {
25 26
26 class DataPromoNotification; 27 class DataPromoNotification;
27 class EventRewriter; 28 class EventRewriter;
28 class EventRewriterController; 29 class EventRewriterController;
29 class IdleActionWarningObserver; 30 class IdleActionWarningObserver;
30 class MagnificationManager; 31 class MagnificationManager;
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 scoped_ptr<internal::DBusServices> dbus_services_; 79 scoped_ptr<internal::DBusServices> dbus_services_;
79 80
80 scoped_ptr<session_manager::SessionManager> session_manager_; 81 scoped_ptr<session_manager::SessionManager> session_manager_;
81 82
82 scoped_ptr<EventRewriterController> keyboard_event_rewriters_; 83 scoped_ptr<EventRewriterController> keyboard_event_rewriters_;
83 84
84 scoped_refptr<chromeos::ExternalMetrics> external_metrics_; 85 scoped_refptr<chromeos::ExternalMetrics> external_metrics_;
85 86
86 #if defined(ENABLE_ARC) 87 #if defined(ENABLE_ARC)
87 scoped_ptr<arc::ArcBridgeService> arc_bridge_service_; 88 scoped_ptr<arc::ArcBridgeService> arc_bridge_service_;
89 scoped_ptr<arc::ArcInputBridge> arc_input_bridge_;
88 #endif 90 #endif
89 91
90 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainPartsChromeos); 92 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainPartsChromeos);
91 }; 93 };
92 94
93 } // namespace chromeos 95 } // namespace chromeos
94 96
95 #endif // CHROME_BROWSER_CHROMEOS_CHROME_BROWSER_MAIN_CHROMEOS_H_ 97 #endif // CHROME_BROWSER_CHROMEOS_CHROME_BROWSER_MAIN_CHROMEOS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698