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

Side by Side Diff: chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h

Issue 2058853002: Enable InputDeviceServer/InputDeviceClient in mash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@mojo_device
Patch Set: Rebase. Created 4 years, 6 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 (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_UI_VIEWS_CHROME_BROWSER_MAIN_EXTRA_PARTS_VIEWS_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_CHROME_BROWSER_MAIN_EXTRA_PARTS_VIEWS_H_
6 #define CHROME_BROWSER_UI_VIEWS_CHROME_BROWSER_MAIN_EXTRA_PARTS_VIEWS_H_ 6 #define CHROME_BROWSER_UI_VIEWS_CHROME_BROWSER_MAIN_EXTRA_PARTS_VIEWS_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "chrome/browser/chrome_browser_main_extra_parts.h" 11 #include "chrome/browser/chrome_browser_main_extra_parts.h"
12 12
13 namespace input_device {
14 class InputDeviceClient;
15 }
16
13 namespace views { 17 namespace views {
14 class ViewsDelegate; 18 class ViewsDelegate;
15 class WindowManagerConnection; 19 class WindowManagerConnection;
16 } 20 }
17 21
18 #if defined(USE_AURA) 22 #if defined(USE_AURA)
19 namespace wm { 23 namespace wm {
20 class WMState; 24 class WMState;
21 } 25 }
22 #endif 26 #endif
23 27
24 class ChromeBrowserMainExtraPartsViews : public ChromeBrowserMainExtraParts { 28 class ChromeBrowserMainExtraPartsViews : public ChromeBrowserMainExtraParts {
25 public: 29 public:
26 ChromeBrowserMainExtraPartsViews(); 30 ChromeBrowserMainExtraPartsViews();
27 ~ChromeBrowserMainExtraPartsViews() override; 31 ~ChromeBrowserMainExtraPartsViews() override;
28 32
29 // Overridden from ChromeBrowserMainExtraParts: 33 // Overridden from ChromeBrowserMainExtraParts:
30 void ToolkitInitialized() override; 34 void ToolkitInitialized() override;
31 void PreCreateThreads() override; 35 void PreCreateThreads() override;
32 void PreProfileInit() override; 36 void PreProfileInit() override;
33 37
34 private: 38 private:
35 std::unique_ptr<views::ViewsDelegate> views_delegate_; 39 std::unique_ptr<views::ViewsDelegate> views_delegate_;
36 40
37 #if defined(USE_AURA) 41 #if defined(USE_AURA)
38 std::unique_ptr<wm::WMState> wm_state_; 42 std::unique_ptr<wm::WMState> wm_state_;
39 #endif 43 #endif
40 #if defined(USE_AURA) && defined(MOJO_SHELL_CLIENT) 44 #if defined(USE_AURA) && defined(MOJO_SHELL_CLIENT)
41 std::unique_ptr<views::WindowManagerConnection> window_manager_connection_; 45 std::unique_ptr<views::WindowManagerConnection> window_manager_connection_;
46
47 // Subscribes to updates about input-devices.
48 std::unique_ptr<input_device::InputDeviceClient> input_device_client_;
42 #endif 49 #endif
43 50
44 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsViews); 51 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsViews);
45 }; 52 };
46 53
47 #endif // CHROME_BROWSER_UI_VIEWS_CHROME_BROWSER_MAIN_EXTRA_PARTS_VIEWS_H_ 54 #endif // CHROME_BROWSER_UI_VIEWS_CHROME_BROWSER_MAIN_EXTRA_PARTS_VIEWS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698