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

Side by Side Diff: content/browser/power_save_blocker_x11.cc

Issue 1159623009: content: Remove use of MessageLoopProxy and deprecated MessageLoop APIs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Test build fix. Created 5 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
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 #include "content/browser/power_save_blocker_impl.h" 5 #include "content/browser/power_save_blocker_impl.h"
6 6
7 #include <X11/Xlib.h> 7 #include <X11/Xlib.h>
8 #include <X11/extensions/dpms.h> 8 #include <X11/extensions/dpms.h>
9 // Xlib #defines Status, but we can't have that for some of our headers. 9 // Xlib #defines Status, but we can't have that for some of our headers.
10 #ifdef Status 10 #ifdef Status
11 #undef Status 11 #undef Status
12 #endif 12 #endif
13 13
14 #include "base/basictypes.h" 14 #include "base/basictypes.h"
15 #include "base/bind.h" 15 #include "base/bind.h"
16 #include "base/callback.h" 16 #include "base/callback.h"
17 #include "base/command_line.h" 17 #include "base/command_line.h"
18 #include "base/environment.h" 18 #include "base/environment.h"
19 #include "base/files/file_path.h" 19 #include "base/files/file_path.h"
20 #include "base/logging.h" 20 #include "base/logging.h"
21 #include "base/memory/ref_counted.h" 21 #include "base/memory/ref_counted.h"
22 #include "base/memory/scoped_ptr.h" 22 #include "base/memory/scoped_ptr.h"
23 #include "base/memory/singleton.h" 23 #include "base/memory/singleton.h"
24 #include "base/message_loop/message_loop_proxy.h"
25 #include "base/nix/xdg_util.h" 24 #include "base/nix/xdg_util.h"
26 #include "base/synchronization/lock.h" 25 #include "base/synchronization/lock.h"
27 #include "content/public/browser/browser_thread.h" 26 #include "content/public/browser/browser_thread.h"
28 #include "dbus/bus.h" 27 #include "dbus/bus.h"
29 #include "dbus/message.h" 28 #include "dbus/message.h"
30 #include "dbus/object_path.h" 29 #include "dbus/object_path.h"
31 #include "dbus/object_proxy.h" 30 #include "dbus/object_proxy.h"
32 #include "ui/gfx/x/x11_types.h" 31 #include "ui/gfx/x/x11_types.h"
33 32
34 namespace { 33 namespace {
(...skipping 350 matching lines...) Expand 10 before | Expand all | Expand 10 after
385 const std::string& description) 384 const std::string& description)
386 : delegate_(new Delegate(type, description)) { 385 : delegate_(new Delegate(type, description)) {
387 delegate_->Init(); 386 delegate_->Init();
388 } 387 }
389 388
390 PowerSaveBlockerImpl::~PowerSaveBlockerImpl() { 389 PowerSaveBlockerImpl::~PowerSaveBlockerImpl() {
391 delegate_->CleanUp(); 390 delegate_->CleanUp();
392 } 391 }
393 392
394 } // namespace content 393 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698