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

Side by Side Diff: ash/shell.h

Issue 145313003: Implement cursor compositing mode on Ash (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Get rid of current_cursor_set_ and requested_cursor_set_ Created 6 years, 10 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
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 #ifndef ASH_SHELL_H_ 5 #ifndef ASH_SHELL_H_
6 #define ASH_SHELL_H_ 6 #define ASH_SHELL_H_
7 7
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 481 matching lines...) Expand 10 before | Expand all | Expand 10 after
492 // TODO(oshima): Move these objects to DisplayController. 492 // TODO(oshima): Move these objects to DisplayController.
493 chromeos::OutputConfigurator* output_configurator() { 493 chromeos::OutputConfigurator* output_configurator() {
494 return output_configurator_.get(); 494 return output_configurator_.get();
495 } 495 }
496 internal::OutputConfiguratorAnimation* output_configurator_animation() { 496 internal::OutputConfiguratorAnimation* output_configurator_animation() {
497 return output_configurator_animation_.get(); 497 return output_configurator_animation_.get();
498 } 498 }
499 internal::DisplayErrorObserver* display_error_observer() { 499 internal::DisplayErrorObserver* display_error_observer() {
500 return display_error_observer_.get(); 500 return display_error_observer_.get();
501 } 501 }
502
503 // Toggles cursor compositing on/off. Native cursor is disabled when cursor
504 // compositing is enabled, and vice versa.
505 void SetCursorCompositingEnabled(bool enabled);
502 #endif // defined(USE_X11) 506 #endif // defined(USE_X11)
503 507
504 internal::ResolutionNotificationController* 508 internal::ResolutionNotificationController*
505 resolution_notification_controller() { 509 resolution_notification_controller() {
506 return resolution_notification_controller_.get(); 510 return resolution_notification_controller_.get();
507 } 511 }
508 #endif // defined(OS_CHROMEOS) 512 #endif // defined(OS_CHROMEOS)
509 513
510 WindowTreeHostFactory* root_window_host_factory() { 514 WindowTreeHostFactory* root_window_host_factory() {
511 return root_window_host_factory_.get(); 515 return root_window_host_factory_.get();
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
715 719
716 // Injected content::GPUDataManager support. 720 // Injected content::GPUDataManager support.
717 scoped_ptr<GPUSupport> gpu_support_; 721 scoped_ptr<GPUSupport> gpu_support_;
718 722
719 DISALLOW_COPY_AND_ASSIGN(Shell); 723 DISALLOW_COPY_AND_ASSIGN(Shell);
720 }; 724 };
721 725
722 } // namespace ash 726 } // namespace ash
723 727
724 #endif // ASH_SHELL_H_ 728 #endif // ASH_SHELL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698