| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 #include "chrome/browser/chrome_browser_main_extra_parts_exo.h" | 5 #include "chrome/browser/chrome_browser_main_extra_parts_exo.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/macros.h" |
| 8 #include "base/message_loop/message_loop.h" | 9 #include "base/message_loop/message_loop.h" |
| 9 #include "chrome/browser/ui/ash/ash_util.h" | 10 #include "chrome/browser/ui/ash/ash_util.h" |
| 10 #include "chrome/common/chrome_switches.h" | 11 #include "chrome/common/chrome_switches.h" |
| 11 #include "components/exo/display.h" | 12 #include "components/exo/display.h" |
| 12 #include "components/exo/wayland/server.h" | 13 #include "components/exo/wayland/server.h" |
| 13 #include "content/public/browser/browser_thread.h" | 14 #include "content/public/browser/browser_thread.h" |
| 14 | 15 |
| 15 class ChromeBrowserMainExtraPartsExo::WaylandWatcher | 16 class ChromeBrowserMainExtraPartsExo::WaylandWatcher |
| 16 : public base::MessagePumpLibevent::Watcher { | 17 : public base::MessagePumpLibevent::Watcher { |
| 17 public: | 18 public: |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 50 wayland_server_ = exo::wayland::Server::Create(display_.get()); | 51 wayland_server_ = exo::wayland::Server::Create(display_.get()); |
| 51 wayland_watcher_ = | 52 wayland_watcher_ = |
| 52 make_scoped_ptr(new WaylandWatcher(wayland_server_.get())); | 53 make_scoped_ptr(new WaylandWatcher(wayland_server_.get())); |
| 53 } | 54 } |
| 54 } | 55 } |
| 55 | 56 |
| 56 void ChromeBrowserMainExtraPartsExo::PostMainMessageLoopRun() { | 57 void ChromeBrowserMainExtraPartsExo::PostMainMessageLoopRun() { |
| 57 wayland_watcher_.reset(); | 58 wayland_watcher_.reset(); |
| 58 wayland_server_.reset(); | 59 wayland_server_.reset(); |
| 59 } | 60 } |
| OLD | NEW |