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

Side by Side Diff: ui/display/chromeos/display_configurator.h

Issue 995103002: Fix video_decode_accelerator_unittest build on non-CrOS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 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/common/gpu/media/rendering_helper.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_DISPLAY_CHROMEOS_DISPLAY_CONFIGURATOR_H_ 5 #ifndef UI_DISPLAY_CHROMEOS_DISPLAY_CONFIGURATOR_H_
6 #define UI_DISPLAY_CHROMEOS_DISPLAY_CONFIGURATOR_H_ 6 #define UI_DISPLAY_CHROMEOS_DISPLAY_CONFIGURATOR_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <map> 10 #include <map>
(...skipping 338 matching lines...) Expand 10 before | Expand all | Expand 10 after
349 void CallAndClearQueuedCallbacks(bool success); 349 void CallAndClearQueuedCallbacks(bool success);
350 350
351 StateController* state_controller_; 351 StateController* state_controller_;
352 SoftwareMirroringController* mirroring_controller_; 352 SoftwareMirroringController* mirroring_controller_;
353 scoped_ptr<NativeDisplayDelegate> native_display_delegate_; 353 scoped_ptr<NativeDisplayDelegate> native_display_delegate_;
354 354
355 // Used to enable modes which rely on panel fitting. 355 // Used to enable modes which rely on panel fitting.
356 bool is_panel_fitting_enabled_; 356 bool is_panel_fitting_enabled_;
357 357
358 // This is detected by the constructor to determine whether or not we should 358 // This is detected by the constructor to determine whether or not we should
359 // be enabled. If we aren't running on ChromeOS, we can't assume that the 359 // be enabled. If we aren't running on ChromeOS, we can't assume that the
Daniel Erat 2015/03/10 19:42:15 nit: mind s/ChromeOS/Chrome OS/ here if you upload
vignatti (out of this project) 2015/03/10 19:45:47 Done.
360 // Xrandr X11 extension is supported. 360 // Xrandr X11 extension or the Ozone underlying display hotplug system are
361 // supported.
361 // If this flag is set to false, any attempts to change the display 362 // If this flag is set to false, any attempts to change the display
362 // configuration to immediately fail without changing the state. 363 // configuration to immediately fail without changing the state.
363 bool configure_display_; 364 bool configure_display_;
364 365
365 // Current configuration state. 366 // Current configuration state.
366 MultipleDisplayState current_display_state_; 367 MultipleDisplayState current_display_state_;
367 chromeos::DisplayPowerState current_power_state_; 368 chromeos::DisplayPowerState current_power_state_;
368 369
369 // Pending requests. These values are used when triggering the next display 370 // Pending requests. These values are used when triggering the next display
370 // configuration. 371 // configuration.
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
425 426
426 // This must be the last variable. 427 // This must be the last variable.
427 base::WeakPtrFactory<DisplayConfigurator> weak_ptr_factory_; 428 base::WeakPtrFactory<DisplayConfigurator> weak_ptr_factory_;
428 429
429 DISALLOW_COPY_AND_ASSIGN(DisplayConfigurator); 430 DISALLOW_COPY_AND_ASSIGN(DisplayConfigurator);
430 }; 431 };
431 432
432 } // namespace ui 433 } // namespace ui
433 434
434 #endif // UI_DISPLAY_CHROMEOS_DISPLAY_CONFIGURATOR_H_ 435 #endif // UI_DISPLAY_CHROMEOS_DISPLAY_CONFIGURATOR_H_
OLDNEW
« no previous file with comments | « content/common/gpu/media/rendering_helper.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698