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

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

Issue 1549113002: Switch to standard integer types in content/browser/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 12 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 | « content/browser/power_save_blocker_win.cc ('k') | content/browser/power_usage_monitor_impl.h » ('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 #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 <stdint.h>
8 #include <X11/extensions/dpms.h> 9 #include <X11/extensions/dpms.h>
9 // Xlib #defines Status, but we can't have that for some of our headers. 10 // Xlib #defines Status, but we can't have that for some of our headers.
10 #ifdef Status 11 #ifdef Status
11 #undef Status 12 #undef Status
12 #endif 13 #endif
13 14
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/macros.h"
21 #include "base/memory/ref_counted.h" 22 #include "base/memory/ref_counted.h"
22 #include "base/memory/scoped_ptr.h" 23 #include "base/memory/scoped_ptr.h"
23 #include "base/memory/singleton.h" 24 #include "base/memory/singleton.h"
24 #include "base/nix/xdg_util.h" 25 #include "base/nix/xdg_util.h"
25 #include "base/synchronization/lock.h" 26 #include "base/synchronization/lock.h"
26 #include "content/public/browser/browser_thread.h" 27 #include "content/public/browser/browser_thread.h"
27 #include "dbus/bus.h" 28 #include "dbus/bus.h"
28 #include "dbus/message.h" 29 #include "dbus/message.h"
29 #include "dbus/object_path.h" 30 #include "dbus/object_path.h"
30 #include "dbus/object_proxy.h" 31 #include "dbus/object_proxy.h"
(...skipping 402 matching lines...) Expand 10 before | Expand all | Expand 10 after
433 } 434 }
434 } 435 }
435 436
436 PowerSaveBlockerImpl::~PowerSaveBlockerImpl() { 437 PowerSaveBlockerImpl::~PowerSaveBlockerImpl() {
437 delegate_->CleanUp(); 438 delegate_->CleanUp();
438 if (freedesktop_suspend_delegate_) 439 if (freedesktop_suspend_delegate_)
439 freedesktop_suspend_delegate_->CleanUp(); 440 freedesktop_suspend_delegate_->CleanUp();
440 } 441 }
441 442
442 } // namespace content 443 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/power_save_blocker_win.cc ('k') | content/browser/power_usage_monitor_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698