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

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

Issue 2398783002: Rename a bunch of Mojo Application stuff to reference Services. (Closed)
Patch Set: . Created 4 years, 2 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"
(...skipping 15 matching lines...) Expand all
26 #endif 26 #endif
27 27
28 class ChromeBrowserMainExtraPartsViews : public ChromeBrowserMainExtraParts { 28 class ChromeBrowserMainExtraPartsViews : public ChromeBrowserMainExtraParts {
29 public: 29 public:
30 ChromeBrowserMainExtraPartsViews(); 30 ChromeBrowserMainExtraPartsViews();
31 ~ChromeBrowserMainExtraPartsViews() override; 31 ~ChromeBrowserMainExtraPartsViews() override;
32 32
33 // Overridden from ChromeBrowserMainExtraParts: 33 // Overridden from ChromeBrowserMainExtraParts:
34 void ToolkitInitialized() override; 34 void ToolkitInitialized() override;
35 void PreCreateThreads() override; 35 void PreCreateThreads() override;
36 void MojoShellConnectionStarted( 36 void ServiceManagerConnectionStarted(
37 content::MojoShellConnection* connection) override; 37 content::ServiceManagerConnection* connection) override;
38 38
39 private: 39 private:
40 std::unique_ptr<views::ViewsDelegate> views_delegate_; 40 std::unique_ptr<views::ViewsDelegate> views_delegate_;
41 41
42 #if defined(USE_AURA) 42 #if defined(USE_AURA)
43 std::unique_ptr<wm::WMState> wm_state_; 43 std::unique_ptr<wm::WMState> wm_state_;
44 std::unique_ptr<views::WindowManagerConnection> window_manager_connection_; 44 std::unique_ptr<views::WindowManagerConnection> window_manager_connection_;
45 45
46 // Subscribes to updates about input-devices. 46 // Subscribes to updates about input-devices.
47 std::unique_ptr<ui::InputDeviceClient> input_device_client_; 47 std::unique_ptr<ui::InputDeviceClient> input_device_client_;
48 #endif 48 #endif
49 49
50 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsViews); 50 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsViews);
51 }; 51 };
52 52
53 #endif // CHROME_BROWSER_UI_VIEWS_CHROME_BROWSER_MAIN_EXTRA_PARTS_VIEWS_H_ 53 #endif // CHROME_BROWSER_UI_VIEWS_CHROME_BROWSER_MAIN_EXTRA_PARTS_VIEWS_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser_command_controller.cc ('k') | chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698