Separate projection mode from rest of touch HUD

ash/root_window_controller.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef ASH_ROOT_WINDOW_CONTROLLER_H_
 #define ASH_ROOT_WINDOW_CONTROLLER_H_
 
+#include <map>
+
 #include "ash/ash_export.h"
 #include "ash/shelf/shelf_types.h"
 #include "ash/system/user/login_status.h"
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/base/ui_base_types.h"
 
 class SkBitmap;
 
 namespace aura {
@@ skipping 27 matching lines @@
 
 class BootSplashScreen;
 class DockedWindowLayoutManager;
 class PanelLayoutManager;
 class RootWindowLayoutManager;
 class ScreenDimmer;
 class ShelfLayoutManager;
 class StatusAreaWidget;
 class SystemBackgroundController;
 class SystemModalContainerLayoutManager;
-class TouchObserverHUD;
+class TouchHudDebug;
+class TouchHudProjection;
 class WorkspaceController;
 
 // This class maintains the per root window state for ash. This class
 // owns the root window and other dependent objects that should be
 // deleted upon the deletion of the root window.  The RootWindowController
 // for particular root window is stored as a property and can be obtained
 // using |GetRootWindowController(aura::RootWindow*)| function.
 class ASH_EXPORT RootWindowController {
  public:
   explicit RootWindowController(aura::RootWindow* root_window);
@@ skipping 18 matching lines @@
   WorkspaceController* workspace_controller() {
     return workspace_controller_.get();
   }
 
   ScreenDimmer* screen_dimmer() { return screen_dimmer_.get(); }
 
   // Access the shelf associated with this root window controller,
   // NULL if no such shelf exists.
   ShelfWidget* shelf() { return shelf_.get(); }
 
-  TouchObserverHUD* touch_observer_hud() { return touch_observer_hud_; }
+  // Get touch HUDs associated with this root window controller.
+  TouchHudDebug* touch_hud_debug() const {
+    return touch_hud_debug_;
+  }
+  TouchHudProjection* touch_hud_projection() const {
+    return touch_hud_projection_;
+  }
 
-  // Sets the touch HUD. The RootWindowController will not own this HUD; its
-  // lifetime is managed by itself.
-  void set_touch_observer_hud(TouchObserverHUD* hud) {
-    touch_observer_hud_ = hud;
+  // Set touch HUDs for this root window controller. The root window controller
+  // will not own the HUDs; their lifetimes are managed by themselves.
+  void set_touch_hud_debug(TouchHudDebug* hud) {
+    touch_hud_debug_ = hud;
   }
+  void set_touch_hud_projection(TouchHudProjection* hud) {

[sky, 2013/06/26 21:07:44]

Who owns hud and what happens to existing hud? Same question on
set_touch_hud_debug.

[mohsen, 2013/06/27 00:44:31]

The hud manages its own lifetime. When the widget showing the hud is being
destroyed (e.g. because of detaching a display or shutting down chromeos), the
hud deletes itself. Here we only have a pointer to the hud associated with this
root window so we can have access to it (e.g. in TouchLogSource or
AcceleratorController).

[sky, 2013/06/28 16:09:00]

Document ownership here.

+    touch_hud_projection_ = hud;
+  }
+
+  // Enables projection touch HUD.
+  void EnableTouchHudProjection();
+
+  // Disables projection touch HUD.
+  void DisableTouchHudProjection();
+
   // Access the shelf layout manager associated with this root
   // window controller, NULL if no such shelf exists.
   ShelfLayoutManager* GetShelfLayoutManager();
 
   // Returns the system tray on this root window. Note that
   // calling this on the root window that doesn't have a launcher will
   // lead to a crash.
   SystemTray* GetSystemTray();
 
   // Shows context menu at the |location_in_screen|. This uses
@@ skipping 54 matching lines @@
 
   // Deletes all child windows and performs necessary cleanup.
   void CloseChildWindows();
 
   // Moves child windows to |dest|.
   void MoveWindowsTo(aura::RootWindow* dest);
 
   // Force the shelf to query for it's current visibility state.
   void UpdateShelfVisibility();
 
+  // Initialize touch HUDs if necessary.
+  void InitTouchHuds();

[sky, 2013/06/26 21:07:44]

Shouldn't this be private?

[mohsen, 2013/06/27 00:44:31]

This function is called from Shell::InitRootWindowController(). That's why it is
public.

+
   // Returns the window, if any, which is in fullscreen mode in the active
   // workspace. Exposed here so clients of Ash don't need to know the details
   // of workspace management.
   aura::Window* GetFullscreenWindow() const;
 
  private:
   // Creates each of the special window containers that holds windows of various
   // types in the shell UI.
   void CreateContainersInRootWindow(aura::RootWindow* root_window);
 
@@ skipping 15 matching lines @@
 
   // Manages layout of panels. Owned by PanelContainer.
   PanelLayoutManager* panel_layout_manager_;
 
   scoped_ptr<SystemBackgroundController> system_background_;
   scoped_ptr<BootSplashScreen> boot_splash_screen_;
 
   scoped_ptr<ScreenDimmer> screen_dimmer_;
   scoped_ptr<WorkspaceController> workspace_controller_;
 
-  // Heads-up display for touch events. The RootWindowController does not own
-  // this HUD; its lifetime is managed by itself.
-  TouchObserverHUD* touch_observer_hud_;
+  // Heads-up displays for touch events. These HUDs are not owned by the root
+  // window controller and manage their own lifetimes.
+  TouchHudDebug* touch_hud_debug_;
+  TouchHudProjection* touch_hud_projection_;
 
   // We need to own event handlers for various containers.
   scoped_ptr<ToplevelWindowEventHandler> default_container_handler_;
   scoped_ptr<ToplevelWindowEventHandler> always_on_top_container_handler_;
   scoped_ptr<ToplevelWindowEventHandler> modal_container_handler_;
   scoped_ptr<ToplevelWindowEventHandler> lock_modal_container_handler_;
   scoped_ptr<ToplevelWindowEventHandler> panel_container_handler_;
   scoped_ptr<ToplevelWindowEventHandler> docked_container_handler_;
 
   DISALLOW_COPY_AND_ASSIGN(RootWindowController);
 };
 
 }  // namespace internal
 }  // ash
 
 #endif  //  ASH_ROOT_WINDOW_CONTROLLER_H_