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

Side by Side Diff: ash/shell.h

Issue 17063013: Separate projection mode from rest of touch HUD (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Renamed TouchHudDebug and applied some more reviews 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
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 444 matching lines...) Expand 10 before | Expand all | Expand 10 after
455 return root_window_host_factory_.get(); 455 return root_window_host_factory_.get();
456 } 456 }
457 457
458 LauncherModel* launcher_model() { 458 LauncherModel* launcher_model() {
459 return launcher_model_.get(); 459 return launcher_model_.get();
460 } 460 }
461 461
462 // Returns the launcher delegate, creating if necesary. 462 // Returns the launcher delegate, creating if necesary.
463 LauncherDelegate* GetLauncherDelegate(); 463 LauncherDelegate* GetLauncherDelegate();
464 464
465 void SetTouchHudProjectionEnabled(bool enabled);
466
467 void ToggleTouchHudProjection();
sky 2013/06/26 21:07:44 Can't the caller trivially implement this rather t
mohsen 2013/06/27 00:44:31 Yes, it can. Removed this function.
468
469 bool is_touch_hud_projection_enabled() const {
sky 2013/06/26 21:07:44 Style guide says function should match member. So
mohsen 2013/06/27 00:44:31 Done.
470 return touch_hud_projection_enabled_;
471 }
472
465 private: 473 private:
466 FRIEND_TEST_ALL_PREFIXES(ExtendedDesktopTest, TestCursor); 474 FRIEND_TEST_ALL_PREFIXES(ExtendedDesktopTest, TestCursor);
467 FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, MouseEventCursors); 475 FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, MouseEventCursors);
468 FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, TransformActivate); 476 FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, TransformActivate);
469 friend class internal::RootWindowController; 477 friend class internal::RootWindowController;
470 friend class test::ShellTestApi; 478 friend class test::ShellTestApi;
471 friend class shell::WindowWatcher; 479 friend class shell::WindowWatcher;
472 480
473 typedef std::pair<aura::Window*, gfx::Rect> WindowAndBoundsPair; 481 typedef std::pair<aura::Window*, gfx::Rect> WindowAndBoundsPair;
474 482
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
597 views::corewm::CursorManager cursor_manager_; 605 views::corewm::CursorManager cursor_manager_;
598 606
599 ObserverList<ShellObserver> observers_; 607 ObserverList<ShellObserver> observers_;
600 608
601 // Used by ash/shell. 609 // Used by ash/shell.
602 content::BrowserContext* browser_context_; 610 content::BrowserContext* browser_context_;
603 611
604 // For testing only: simulate that a modal window is open 612 // For testing only: simulate that a modal window is open
605 bool simulate_modal_window_open_for_testing_; 613 bool simulate_modal_window_open_for_testing_;
606 614
615 bool touch_hud_projection_enabled_;
616
607 DISALLOW_COPY_AND_ASSIGN(Shell); 617 DISALLOW_COPY_AND_ASSIGN(Shell);
608 }; 618 };
609 619
610 } // namespace ash 620 } // namespace ash
611 621
612 #endif // ASH_SHELL_H_ 622 #endif // ASH_SHELL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698