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

Side by Side Diff: ash/display/display_controller.cc

Issue 18050008: Use a direct include of time headers in android_webview/, apps/, ash/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « ash/display/display_controller.h ('k') | ash/display/output_configurator_animation.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 "ash/display/display_controller.h" 5 #include "ash/display/display_controller.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 #include <map> 9 #include <map>
10 10
(...skipping 26 matching lines...) Expand all
37 #include "ui/aura/window.h" 37 #include "ui/aura/window.h"
38 #include "ui/aura/window_property.h" 38 #include "ui/aura/window_property.h"
39 #include "ui/aura/window_tracker.h" 39 #include "ui/aura/window_tracker.h"
40 #include "ui/compositor/compositor.h" 40 #include "ui/compositor/compositor.h"
41 #include "ui/compositor/dip_util.h" 41 #include "ui/compositor/dip_util.h"
42 #include "ui/gfx/display.h" 42 #include "ui/gfx/display.h"
43 #include "ui/gfx/screen.h" 43 #include "ui/gfx/screen.h"
44 44
45 #if defined(OS_CHROMEOS) 45 #if defined(OS_CHROMEOS)
46 #include "base/chromeos/chromeos_version.h" 46 #include "base/chromeos/chromeos_version.h"
47 #include "base/time.h" 47 #include "base/time/time.h"
48 #if defined(USE_X11) 48 #if defined(USE_X11)
49 #include "ash/display/output_configurator_animation.h" 49 #include "ash/display/output_configurator_animation.h"
50 #include "chromeos/display/output_configurator.h" 50 #include "chromeos/display/output_configurator.h"
51 #include "ui/base/x/x11_util.h" 51 #include "ui/base/x/x11_util.h"
52 52
53 // Including this at the bottom to avoid other 53 // Including this at the bottom to avoid other
54 // potential conflict with chrome headers. 54 // potential conflict with chrome headers.
55 #include <X11/extensions/Xrandr.h> 55 #include <X11/extensions/Xrandr.h>
56 #undef RootWindow 56 #undef RootWindow
57 #endif // defined(USE_X11) 57 #endif // defined(USE_X11)
(...skipping 942 matching lines...) Expand 10 before | Expand all | Expand 10 after
1000 for (size_t i = 0; i < root_windows.size(); ++i) { 1000 for (size_t i = 0; i < root_windows.size(); ++i) {
1001 std::string name = 1001 std::string name =
1002 root_windows[i] == primary ? "aura_root_0" : "aura_root_x"; 1002 root_windows[i] == primary ? "aura_root_0" : "aura_root_x";
1003 gfx::AcceleratedWidget xwindow = root_windows[i]->GetAcceleratedWidget(); 1003 gfx::AcceleratedWidget xwindow = root_windows[i]->GetAcceleratedWidget();
1004 XStoreName(ui::GetXDisplay(), xwindow, name.c_str()); 1004 XStoreName(ui::GetXDisplay(), xwindow, name.c_str());
1005 } 1005 }
1006 #endif 1006 #endif
1007 } 1007 }
1008 1008
1009 } // namespace ash 1009 } // namespace ash
OLDNEW
« no previous file with comments | « ash/display/display_controller.h ('k') | ash/display/output_configurator_animation.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698