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

Side by Side Diff: ash/accelerators/accelerator_controller_unittest.cc

Issue 10905288: Switch primary display (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sync Created 8 years, 3 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/accelerators/accelerator_controller.cc ('k') | ash/accelerators/accelerator_table.h » ('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 #include "ash/accelerators/accelerator_controller.h" 5 #include "ash/accelerators/accelerator_controller.h"
6 #include "ash/accelerators/accelerator_table.h" 6 #include "ash/accelerators/accelerator_table.h"
7 #include "ash/caps_lock_delegate.h" 7 #include "ash/caps_lock_delegate.h"
8 #include "ash/display/multi_display_manager.h" 8 #include "ash/display/multi_display_manager.h"
9 #include "ash/ime_control_delegate.h" 9 #include "ash/ime_control_delegate.h"
10 #include "ash/screenshot_delegate.h" 10 #include "ash/screenshot_delegate.h"
(...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after
310 310
311 class AcceleratorControllerTest : public AshTestBase { 311 class AcceleratorControllerTest : public AshTestBase {
312 public: 312 public:
313 AcceleratorControllerTest() {}; 313 AcceleratorControllerTest() {};
314 virtual ~AcceleratorControllerTest() {}; 314 virtual ~AcceleratorControllerTest() {};
315 315
316 protected: 316 protected:
317 void EnableInternalDisplay() { 317 void EnableInternalDisplay() {
318 static_cast<internal::MultiDisplayManager*>( 318 static_cast<internal::MultiDisplayManager*>(
319 aura::Env::GetInstance()->display_manager())-> 319 aura::Env::GetInstance()->display_manager())->
320 EnableInternalDisplayForTest(); 320 SetFirstDisplayAsInternalDisplayForTest();
321 } 321 }
322 322
323 static AcceleratorController* GetController(); 323 static AcceleratorController* GetController();
324 324
325 private: 325 private:
326 DISALLOW_COPY_AND_ASSIGN(AcceleratorControllerTest); 326 DISALLOW_COPY_AND_ASSIGN(AcceleratorControllerTest);
327 }; 327 };
328 328
329 AcceleratorController* AcceleratorControllerTest::GetController() { 329 AcceleratorController* AcceleratorControllerTest::GetController() {
330 return Shell::GetInstance()->accelerator_controller(); 330 return Shell::GetInstance()->accelerator_controller();
(...skipping 677 matching lines...) Expand 10 before | Expand all | Expand 10 after
1008 EXPECT_FALSE(GetController()->IsReservedAccelerator( 1008 EXPECT_FALSE(GetController()->IsReservedAccelerator(
1009 ui::Accelerator(ui::VKEY_PRINT, ui::EF_NONE))); 1009 ui::Accelerator(ui::VKEY_PRINT, ui::EF_NONE)));
1010 EXPECT_FALSE(GetController()->IsReservedAccelerator( 1010 EXPECT_FALSE(GetController()->IsReservedAccelerator(
1011 ui::Accelerator(ui::VKEY_TAB, ui::EF_NONE))); 1011 ui::Accelerator(ui::VKEY_TAB, ui::EF_NONE)));
1012 EXPECT_FALSE(GetController()->IsReservedAccelerator( 1012 EXPECT_FALSE(GetController()->IsReservedAccelerator(
1013 ui::Accelerator(ui::VKEY_A, ui::EF_NONE))); 1013 ui::Accelerator(ui::VKEY_A, ui::EF_NONE)));
1014 } 1014 }
1015 1015
1016 } // namespace test 1016 } // namespace test
1017 } // namespace ash 1017 } // namespace ash
OLDNEW
« no previous file with comments | « ash/accelerators/accelerator_controller.cc ('k') | ash/accelerators/accelerator_table.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698