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

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

Issue 2027093002: mus: Initialize WindowManagerConnection in chrome instead of in content. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . 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
« no previous file with comments | « no previous file | chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 10 matching lines...) Expand all
21 #endif 21 #endif
22 22
23 class ChromeBrowserMainExtraPartsViews : public ChromeBrowserMainExtraParts { 23 class ChromeBrowserMainExtraPartsViews : public ChromeBrowserMainExtraParts {
24 public: 24 public:
25 ChromeBrowserMainExtraPartsViews(); 25 ChromeBrowserMainExtraPartsViews();
26 ~ChromeBrowserMainExtraPartsViews() override; 26 ~ChromeBrowserMainExtraPartsViews() override;
27 27
28 // Overridden from ChromeBrowserMainExtraParts: 28 // Overridden from ChromeBrowserMainExtraParts:
29 void ToolkitInitialized() override; 29 void ToolkitInitialized() override;
30 void PreCreateThreads() override; 30 void PreCreateThreads() override;
31 void PreProfileInit() override;
31 32
32 private: 33 private:
33 std::unique_ptr<views::ViewsDelegate> views_delegate_; 34 std::unique_ptr<views::ViewsDelegate> views_delegate_;
34 35
35 #if defined(USE_AURA) 36 #if defined(USE_AURA)
36 std::unique_ptr<wm::WMState> wm_state_; 37 std::unique_ptr<wm::WMState> wm_state_;
37 #endif 38 #endif
38 39
39 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsViews); 40 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsViews);
40 }; 41 };
41 42
42 #endif // CHROME_BROWSER_UI_VIEWS_CHROME_BROWSER_MAIN_EXTRA_PARTS_VIEWS_H_ 43 #endif // CHROME_BROWSER_UI_VIEWS_CHROME_BROWSER_MAIN_EXTRA_PARTS_VIEWS_H_
OLDNEW
« no previous file with comments | « no previous file | 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