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

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

Issue 2758323002: Broke out layout metric information from ViewsDelegate to LayoutProvider (Closed)
Patch Set: Final feedback addressed Created 3 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 (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 #include "ui/views/layout/layout_provider.h"
12 13
13 namespace ui { 14 namespace ui {
14 class InputDeviceClient; 15 class InputDeviceClient;
15 } 16 }
16 17
17 namespace views { 18 namespace views {
18 class ViewsDelegate; 19 class ViewsDelegate;
19 } 20 }
20 21
21 #if defined(USE_AURA) 22 #if defined(USE_AURA)
(...skipping 12 matching lines...) Expand all
34 35
35 // Overridden from ChromeBrowserMainExtraParts: 36 // Overridden from ChromeBrowserMainExtraParts:
36 void ToolkitInitialized() override; 37 void ToolkitInitialized() override;
37 void PreCreateThreads() override; 38 void PreCreateThreads() override;
38 void PreProfileInit() override; 39 void PreProfileInit() override;
39 void ServiceManagerConnectionStarted( 40 void ServiceManagerConnectionStarted(
40 content::ServiceManagerConnection* connection) override; 41 content::ServiceManagerConnection* connection) override;
41 42
42 private: 43 private:
43 std::unique_ptr<views::ViewsDelegate> views_delegate_; 44 std::unique_ptr<views::ViewsDelegate> views_delegate_;
45 std::unique_ptr<views::LayoutProvider> layout_provider_;
44 46
45 #if defined(USE_AURA) 47 #if defined(USE_AURA)
46 // Not created when running in ash::Config::MUS. 48 // Not created when running in ash::Config::MUS.
47 std::unique_ptr<wm::WMState> wm_state_; 49 std::unique_ptr<wm::WMState> wm_state_;
48 50
49 // Only used when running in ash::Config::MASH. 51 // Only used when running in ash::Config::MASH.
50 std::unique_ptr<views::MusClient> mus_client_; 52 std::unique_ptr<views::MusClient> mus_client_;
51 53
52 // Subscribes to updates about input-devices. 54 // Subscribes to updates about input-devices.
53 std::unique_ptr<ui::InputDeviceClient> input_device_client_; 55 std::unique_ptr<ui::InputDeviceClient> input_device_client_;
54 #endif 56 #endif
55 57
56 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsViews); 58 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsViews);
57 }; 59 };
58 60
59 #endif // CHROME_BROWSER_UI_VIEWS_CHROME_BROWSER_MAIN_EXTRA_PARTS_VIEWS_H_ 61 #endif // CHROME_BROWSER_UI_VIEWS_CHROME_BROWSER_MAIN_EXTRA_PARTS_VIEWS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698