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

Side by Side Diff: ui/views/widget/desktop_aura/desktop_screen_x11.h

Issue 1355063004: Template methods on Timer classes instead of the classes themselves. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: timer: fixcaller Created 5 years, 3 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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_SCREEN_X11_H_ 5 #ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_SCREEN_X11_H_
6 #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_SCREEN_X11_H_ 6 #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_SCREEN_X11_H_
7 7
8 #include "base/timer/timer.h" 8 #include "base/timer/timer.h"
9 #include "ui/events/platform/platform_event_dispatcher.h" 9 #include "ui/events/platform/platform_event_dispatcher.h"
10 #include "ui/gfx/display_change_notifier.h" 10 #include "ui/gfx/display_change_notifier.h"
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 68
69 // The base of the event numbers used to represent XRandr events used in 69 // The base of the event numbers used to represent XRandr events used in
70 // decoding events regarding output add/remove. 70 // decoding events regarding output add/remove.
71 int xrandr_event_base_; 71 int xrandr_event_base_;
72 72
73 // The display objects we present to chrome. 73 // The display objects we present to chrome.
74 std::vector<gfx::Display> displays_; 74 std::vector<gfx::Display> displays_;
75 75
76 // The timer to delay configuring outputs. See also the comments in 76 // The timer to delay configuring outputs. See also the comments in
77 // Dispatch(). 77 // Dispatch().
78 scoped_ptr<base::OneShotTimer<DesktopScreenX11> > configure_timer_; 78 scoped_ptr<base::OneShotTimer> configure_timer_;
79 79
80 gfx::DisplayChangeNotifier change_notifier_; 80 gfx::DisplayChangeNotifier change_notifier_;
81 81
82 DISALLOW_COPY_AND_ASSIGN(DesktopScreenX11); 82 DISALLOW_COPY_AND_ASSIGN(DesktopScreenX11);
83 }; 83 };
84 84
85 } // namespace views 85 } // namespace views
86 86
87 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_SCREEN_X11_H_ 87 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_SCREEN_X11_H_
OLDNEW
« no previous file with comments | « ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.h ('k') | ui/views/widget/desktop_aura/desktop_screen_x11.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698