Allow setting different hit test bounds overrides for mouse and touch

ash/system/web_notification/web_notification_tray_unittest.cc

 // 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.
 
 #include "ash/system/web_notification/web_notification_tray.h"
 
 #include <vector>
 
 #include "ash/display/display_manager.h"
 #include "ash/root_window_controller.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
 #include "ash/system/status_area_widget.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_item.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/test_system_tray_delegate.h"
-#include "ash/wm/window_properties.h"
+#include "ash/wm/window_state.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/test/event_generator.h"
 #include "ui/aura/window.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/screen.h"
 #include "ui/message_center/message_center_style.h"
 #include "ui/message_center/message_center_tray.h"
 #include "ui/message_center/message_center_util.h"
@@ skipping 392 matching lines @@
   // Checks the work area for normal auto-hidden state.
   scoped_ptr<aura::Window> window(
       CreateTestWindowInShellWithBounds(gfx::Rect(1, 2, 3, 4)));
   internal::ShelfLayoutManager* shelf =
       Shell::GetPrimaryRootWindowController()->GetShelfLayoutManager();
   shelf->SetAutoHideBehavior(SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS);
   EXPECT_EQ(SHELF_AUTO_HIDE_HIDDEN, shelf->auto_hide_state());
   gfx::Rect work_area_auto_hidden = GetPopupWorkArea();
   shelf->SetAutoHideBehavior(SHELF_AUTO_HIDE_BEHAVIOR_NEVER);
 
-  // Make the window to use immersive mode.
-  window->SetProperty(internal::kFullscreenUsesMinimalChromeKey, true);
+  // Make the window use browser immersive fullscreen.
   window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_FULLSCREEN);
+  wm::GetWindowState(window.get())->SetFullscreenType(
+      wm::FULLSCREEN_TYPE_IMMERSIVE_MINIMAL_CHROME);
   RunAllPendingInMessageLoop();
 
   // The work area for auto-hidden status of fullscreen is a bit larger
   // since it doesn't even have the 3-pixel width.
   EXPECT_EQ(SHELF_AUTO_HIDE_HIDDEN, shelf->auto_hide_state());
   gfx::Rect work_area_fullscreen_hidden = GetPopupWorkArea();
   EXPECT_EQ(work_area_auto_hidden.ToString(),
             work_area_fullscreen_hidden.ToString());
 
   // Move the mouse cursor at the bottom, which shows the shelf.
@@ skipping 21 matching lines @@
 
   // System tray is created on the primary display. The popups in the secondary
   // tray aren't affected.
   GetSystemTray()->ShowDefaultView(BUBBLE_CREATE_NEW);
   EXPECT_GT(work_area.size().GetArea(), GetPopupWorkArea().size().GetArea());
   EXPECT_EQ(work_area_second.ToString(),
             GetPopupWorkAreaForTray(GetSecondaryTray()).ToString());
 }
 
 }  // namespace ash