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

Side by Side Diff: ash/system/chromeos/power/tablet_power_button_controller_unittest.cc

Issue 2506493002: Add a switch for tablet power button behavior (Closed)
Patch Set: based on comments Created 4 years, 1 month 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
« no previous file with comments | « ash/common/ash_switches.cc ('k') | ash/wm/power_button_controller.cc » ('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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/system/chromeos/power/tablet_power_button_controller.h" 5 #include "ash/system/chromeos/power/tablet_power_button_controller.h"
6 6
7 #include <memory> 7 #include <memory>
8 8
9 #include "ash/common/ash_switches.h" 9 #include "ash/common/ash_switches.h"
10 #include "ash/common/session/session_state_delegate.h" 10 #include "ash/common/session/session_state_delegate.h"
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 ~TabletPowerButtonControllerTest() override {} 43 ~TabletPowerButtonControllerTest() override {}
44 44
45 void SetUp() override { 45 void SetUp() override {
46 // This also initializes DBusThreadManager. 46 // This also initializes DBusThreadManager.
47 std::unique_ptr<chromeos::DBusThreadManagerSetter> dbus_setter = 47 std::unique_ptr<chromeos::DBusThreadManagerSetter> dbus_setter =
48 chromeos::DBusThreadManager::GetSetterForTesting(); 48 chromeos::DBusThreadManager::GetSetterForTesting();
49 power_manager_client_ = new chromeos::FakePowerManagerClient(); 49 power_manager_client_ = new chromeos::FakePowerManagerClient();
50 dbus_setter->SetPowerManagerClient(base::WrapUnique(power_manager_client_)); 50 dbus_setter->SetPowerManagerClient(base::WrapUnique(power_manager_client_));
51 base::CommandLine::ForCurrentProcess()->AppendSwitch( 51 base::CommandLine::ForCurrentProcess()->AppendSwitch(
52 switches::kAshEnableTouchViewTesting); 52 switches::kAshEnableTouchViewTesting);
53 base::CommandLine::ForCurrentProcess()->AppendSwitch(
54 switches::kAshEnableTabletPowerButton);
53 AshTestBase::SetUp(); 55 AshTestBase::SetUp();
54 56
55 lock_state_controller_ = Shell::GetInstance()->lock_state_controller(); 57 lock_state_controller_ = Shell::GetInstance()->lock_state_controller();
56 tablet_controller_ = Shell::GetInstance() 58 tablet_controller_ = Shell::GetInstance()
57 ->power_button_controller() 59 ->power_button_controller()
58 ->tablet_power_button_controller_for_test(); 60 ->tablet_power_button_controller_for_test();
59 test_api_ = base::MakeUnique<TabletPowerButtonController::TestApi>( 61 test_api_ = base::MakeUnique<TabletPowerButtonController::TestApi>(
60 tablet_controller_); 62 tablet_controller_);
61 generator_ = &AshTestBase::GetEventGenerator(); 63 generator_ = &AshTestBase::GetEventGenerator();
62 power_manager_client_->SendBrightnessChanged(kNonZeroBrightness, false); 64 power_manager_client_->SendBrightnessChanged(kNonZeroBrightness, false);
(...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after
297 EXPECT_TRUE(GetBacklightsForcedOff()); 299 EXPECT_TRUE(GetBacklightsForcedOff());
298 300
299 generator_->EnterPenPointerMode(); 301 generator_->EnterPenPointerMode();
300 generator_->MoveMouseBy(1, 1); 302 generator_->MoveMouseBy(1, 1);
301 EXPECT_TRUE(GetBacklightsForcedOff()); 303 EXPECT_TRUE(GetBacklightsForcedOff());
302 generator_->ExitPenPointerMode(); 304 generator_->ExitPenPointerMode();
303 } 305 }
304 306
305 } // namespace test 307 } // namespace test
306 } // namespace ash 308 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/ash_switches.cc ('k') | ash/wm/power_button_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698