Add IsInternal property to gfx::Display

ash/accelerators/accelerator_controller_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/accelerators/accelerator_controller.h"
 #include "ash/accelerators/accelerator_table.h"
 #include "ash/caps_lock_delegate.h"
 #include "ash/display/display_manager.h"
 #include "ash/ime_control_delegate.h"
 #include "ash/screenshot_delegate.h"
@@ skipping 299 matching lines @@
  public:
   AcceleratorControllerTest() {};
   virtual ~AcceleratorControllerTest() {};
 
  protected:
   void EnableInternalDisplay() {
     Shell::GetInstance()->display_manager()->
         SetFirstDisplayAsInternalDisplayForTest();
   }
 
+  void DisableInternalDisplay() {

[oshima, 2013/02/12 17:38:51]

It's better to reset in AshTestBase::TearDown,
and you probably don't need a method.

[ynovikov, 2013/02/12 21:17:47]

Done.

+    Shell::GetInstance()->display_manager()->ResetInternalDisplayForTest();
+  }
+
   static AcceleratorController* GetController();
   static bool ProcessWithContext(const ui::Accelerator& accelerator);
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AcceleratorControllerTest);
 };
 
 AcceleratorController* AcceleratorControllerTest::GetController() {
   return Shell::GetInstance()->accelerator_controller();
 }
@@ skipping 554 matching lines @@
   // Open file manager dialog
   EXPECT_TRUE(ProcessWithContext(
       ui::Accelerator(ui::VKEY_O, ui::EF_CONTROL_DOWN)));
 
   // Lock screen
   // NOTE: Accelerators that do not work on the lock screen need to be
   // tested before the sequence below is invoked because it causes a side
   // effect of locking the screen.
   EXPECT_TRUE(ProcessWithContext(
       ui::Accelerator(ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN)));
+  DisableInternalDisplay();
 #endif
 }
 
 TEST_F(AcceleratorControllerTest, GlobalAcceleratorsToggleAppList) {
   test::TestShellDelegate* delegate =
       reinterpret_cast<test::TestShellDelegate*>(
           ash::Shell::GetInstance()->delegate());
   EXPECT_FALSE(ash::Shell::GetInstance()->GetAppListTargetVisibility());
 
   // The press event should not open the AppList, the release should instead.
@@ skipping 328 matching lines @@
     EXPECT_EQ(volume_mute, delegate->last_accelerator());
     EXPECT_EQ(0, delegate->handle_volume_down_count());
     EXPECT_TRUE(ProcessWithContext(volume_down));
     EXPECT_EQ(1, delegate->handle_volume_down_count());
     EXPECT_EQ(volume_down, delegate->last_accelerator());
     EXPECT_EQ(0, delegate->handle_volume_up_count());
     EXPECT_TRUE(ProcessWithContext(volume_up));
     EXPECT_EQ(1, delegate->handle_volume_up_count());
     EXPECT_EQ(volume_up, delegate->last_accelerator());
   }
+  DisableInternalDisplay();
 }
 #endif
 
 }  // namespace ash