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

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 changes in ui/views/. Let Shell call AshNativeCursorManager directly. 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
« no previous file with comments | « ash/display/mouse_cursor_event_filter.cc ('k') | ash/shell.cc » ('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 #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 519 matching lines...) Expand 10 before | Expand all | Expand 10 after
530 530
531 bool is_touch_hud_projection_enabled() const { 531 bool is_touch_hud_projection_enabled() const {
532 return is_touch_hud_projection_enabled_; 532 return is_touch_hud_projection_enabled_;
533 } 533 }
534 534
535 #if defined(OS_CHROMEOS) 535 #if defined(OS_CHROMEOS)
536 // Creates instance of FirstRunHelper. Caller is responsible for deleting 536 // Creates instance of FirstRunHelper. Caller is responsible for deleting
537 // returned object. 537 // returned object.
538 ash::FirstRunHelper* CreateFirstRunHelper(); 538 ash::FirstRunHelper* CreateFirstRunHelper();
539 539
540 // Toggles cursor compositing on/off. Native cursor is disabled when cursor
541 // compositing is enabled, and vice versa.
542 void SetCursorCompositingEnabled(bool enabled);
543
540 StickyKeysController* sticky_keys_controller() { 544 StickyKeysController* sticky_keys_controller() {
541 return sticky_keys_controller_.get(); 545 return sticky_keys_controller_.get();
542 } 546 }
543 #endif // defined(OS_CHROMEOS) 547 #endif // defined(OS_CHROMEOS)
544 548
545 GPUSupport* gpu_support() { return gpu_support_.get(); } 549 GPUSupport* gpu_support() { return gpu_support_.get(); }
546 550
547 private: 551 private:
548 FRIEND_TEST_ALL_PREFIXES(ExtendedDesktopTest, TestCursor); 552 FRIEND_TEST_ALL_PREFIXES(ExtendedDesktopTest, TestCursor);
549 FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, MouseEventCursors); 553 FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, MouseEventCursors);
(...skipping 165 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
« no previous file with comments | « ash/display/mouse_cursor_event_filter.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698