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

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

Issue 2462423002: Condition the use of ChromeBrowserMainExtraPartsViewsLinux to !use_ozone (Closed)
Patch Set: same as patchset 6, w/ grouped includes Created 4 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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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_LINUX_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_CHROME_BROWSER_MAIN_EXTRA_PARTS_VIEWS_LINUX_H_
6 #define CHROME_BROWSER_UI_VIEWS_CHROME_BROWSER_MAIN_EXTRA_PARTS_VIEWS_LINUX_H_ 6 #define CHROME_BROWSER_UI_VIEWS_CHROME_BROWSER_MAIN_EXTRA_PARTS_VIEWS_LINUX_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
11 #include "base/macros.h" 11 #include "base/macros.h"
12 #include "build/build_config.h" 12 #include "build/build_config.h"
13 #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h" 13 #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h"
14 #include "ui/views/widget/desktop_aura/x11_desktop_handler_observer.h" 14 #include "ui/views/widget/desktop_aura/x11_desktop_handler_observer.h"
15 15
16 class ChromeBrowserMainExtraPartsViewsLinux 16 class ChromeBrowserMainExtraPartsViewsLinux
17 : public ChromeBrowserMainExtraPartsViews, 17 : public ChromeBrowserMainExtraPartsViews,
18 public views::X11DesktopHandlerObserver { 18 public views::X11DesktopHandlerObserver {
19 public: 19 public:
20 ChromeBrowserMainExtraPartsViewsLinux(); 20 ChromeBrowserMainExtraPartsViewsLinux();
21 ~ChromeBrowserMainExtraPartsViewsLinux() override; 21 ~ChromeBrowserMainExtraPartsViewsLinux() override;
22 22
23 // Overridden from ChromeBrowserMainExtraParts: 23 // Overridden from ChromeBrowserMainExtraParts:
24 void PreEarlyInitialization() override; 24 void PreEarlyInitialization() override;
25 void ToolkitInitialized() override; 25 void ToolkitInitialized() override;
26 void PreCreateThreads() override; 26 void PreCreateThreads() override;
27 void PreProfileInit() override;
28 27
29 // Overridden from views::X11DesktopHandlerObserver. 28 // Overridden from views::X11DesktopHandlerObserver.
30 void OnWorkspaceChanged(const std::string& new_workspace) override; 29 void OnWorkspaceChanged(const std::string& new_workspace) override;
31 30
32 private: 31 private:
33 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsViewsLinux); 32 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsViewsLinux);
34 }; 33 };
35 34
36 #endif // CHROME_BROWSER_UI_VIEWS_CHROME_BROWSER_MAIN_EXTRA_PARTS_VIEWS_LINUX_H _ 35 #endif // CHROME_BROWSER_UI_VIEWS_CHROME_BROWSER_MAIN_EXTRA_PARTS_VIEWS_LINUX_H _
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698