Chromium Code Reviews| OLD | NEW |
|---|---|
| 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_ASH_CHROME_BROWSER_MAIN_EXTRA_PARTS_ASH_H_ | 5 #ifndef CHROME_BROWSER_UI_VIEWS_ASH_CHROME_BROWSER_MAIN_EXTRA_PARTS_ASH_H_ |
| 6 #define CHROME_BROWSER_UI_VIEWS_ASH_CHROME_BROWSER_MAIN_EXTRA_PARTS_ASH_H_ | 6 #define CHROME_BROWSER_UI_VIEWS_ASH_CHROME_BROWSER_MAIN_EXTRA_PARTS_ASH_H_ |
| 7 | 7 |
| 8 #include "base/basictypes.h" | 8 #include "base/basictypes.h" |
| 9 #include "base/compiler_specific.h" | 9 #include "base/compiler_specific.h" |
| 10 #include "base/memory/scoped_ptr.h" | |
| 10 #include "chrome/browser/chrome_browser_main_extra_parts.h" | 11 #include "chrome/browser/chrome_browser_main_extra_parts.h" |
| 11 | 12 |
| 13 #if defined(ENABLE_WAYLAND_SERVER) | |
| 14 namespace exo { | |
| 15 class Display; | |
| 16 namespace wayland { | |
| 17 class Server; | |
| 18 } | |
| 19 } | |
| 20 #endif | |
| 21 | |
| 12 class ChromeBrowserMainExtraPartsAsh : public ChromeBrowserMainExtraParts { | 22 class ChromeBrowserMainExtraPartsAsh : public ChromeBrowserMainExtraParts { |
| 13 public: | 23 public: |
| 14 ChromeBrowserMainExtraPartsAsh(); | 24 ChromeBrowserMainExtraPartsAsh(); |
| 15 ~ChromeBrowserMainExtraPartsAsh() override; | 25 ~ChromeBrowserMainExtraPartsAsh() override; |
| 16 | 26 |
| 17 // Overridden from ChromeBrowserMainExtraParts: | 27 // Overridden from ChromeBrowserMainExtraParts: |
| 18 void PreProfileInit() override; | 28 void PreProfileInit() override; |
| 19 void PostProfileInit() override; | 29 void PostProfileInit() override; |
| 20 void PostMainMessageLoopRun() override; | 30 void PostMainMessageLoopRun() override; |
| 21 | 31 |
| 22 private: | 32 private: |
| 33 #if defined(ENABLE_WAYLAND_SERVER) | |
| 34 scoped_ptr<exo::Display> exo_display_; | |
|
sky
2015/11/18 21:01:21
Does this code need to be in ChromeBrowserMainExtr
reveman
2015/11/18 23:55:18
Sure, moved it to ChromeBrowserMainExtraPartsExo i
| |
| 35 scoped_ptr<exo::wayland::Server> wayland_server_; | |
| 36 class WaylandWatcher; | |
| 37 scoped_ptr<WaylandWatcher> wayland_watcher_; | |
| 38 #endif | |
| 39 | |
| 23 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsAsh); | 40 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsAsh); |
| 24 }; | 41 }; |
| 25 | 42 |
| 26 #endif // CHROME_BROWSER_UI_VIEWS_ASH_CHROME_BROWSER_MAIN_EXTRA_PARTS_ASH_H_ | 43 #endif // CHROME_BROWSER_UI_VIEWS_ASH_CHROME_BROWSER_MAIN_EXTRA_PARTS_ASH_H_ |
| OLD | NEW |