chrome/browser/chromeos/input_method/input_method_manager_impl_unittest.cc - Issue 2953033002: Hide handwriting and voice buttons when keyboard is in restricted state

Side by Side Diff: chrome/browser/chromeos/input_method/input_method_manager_impl_unittest.cc

Issue 2953033002: Hide handwriting and voice buttons when keyboard is in restricted state (Closed)

Patch Set: Created 3 years, 5 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:

« chrome/browser/chromeos/input_method/input_method_manager_impl.cc ('K') | « chrome/browser/chromeos/input_method/input_method_manager_impl.cc ('k') | extensions/browser/api/virtual_keyboard/virtual_keyboard_api.cc » ('j') | extensions/browser/api/virtual_keyboard/virtual_keyboard_api.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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 "chrome/browser/chromeos/input_method/input_method_manager_impl.h"	5 #include "chrome/browser/chromeos/input_method/input_method_manager_impl.h"

6	6

7 #include <stddef.h>	7 #include <stddef.h>

8	8

9 #include <algorithm>	9 #include <algorithm>

10 #include <memory>	10 #include <memory>

(...skipping 1627 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1638 ime_controller.current_ime_id_);	1638 ime_controller.current_ime_id_);

1639	1639

1640 // Unlock screen. The original state, pinyin-dv, is restored.	1640 // Unlock screen. The original state, pinyin-dv, is restored.

1641 manager_->SetState(saved_ime_state);	1641 manager_->SetState(saved_ime_state);

1642 manager_->SetUISessionState(InputMethodManager::STATE_BROWSER_SCREEN);	1642 manager_->SetUISessionState(InputMethodManager::STATE_BROWSER_SCREEN);

1643 ime_controller_client.FlushMojoForTesting();	1643 ime_controller_client.FlushMojoForTesting();

1644 ASSERT_EQ(3u, ime_controller.available_imes_.size()); // Dvorak and 2 IMEs.	1644 ASSERT_EQ(3u, ime_controller.available_imes_.size()); // Dvorak and 2 IMEs.

1645 EXPECT_EQ(ImeIdFromEngineId(ids[1]), ime_controller.current_ime_id_);	1645 EXPECT_EQ(ImeIdFromEngineId(ids[1]), ime_controller.current_ime_id_);

1646 }	1646 }

1647	1647

	1648 TEST_F(InputMethodManagerImplTest, SetOneFeatureRestricted) {

	1649 EXPECT_TRUE(manager_->GetFeaturesRestricted(

	1650 InputMethodManager::FeaturesRestricted::NONE));

	1651

	1652 // Sets emoji restricted and not restricted
	James Cook 2017/06/27 16:31:11 super-nit: Comments should end with "." here and b super-nit: Comments should end with "." here and below Azure Wei 2017/06/29 16:37:03 Done. Show quoted text On 2017/06/27 16:31:11, James Cook wrote: > super-nit: Comments should end with "." here and below Done.
	1653 manager_->SetFeaturesRestricted(InputMethodManager::FeaturesRestricted::EMOJI,

	1654 true);

	1655 EXPECT_TRUE(manager_->GetFeaturesRestricted(

	1656 InputMethodManager::FeaturesRestricted::EMOJI));

	1657 manager_->SetFeaturesRestricted(InputMethodManager::FeaturesRestricted::EMOJI,

	1658 false);

	1659 EXPECT_TRUE(manager_->GetFeaturesRestricted(

	1660 InputMethodManager::FeaturesRestricted::NONE));

	1661

	1662 // Sets voice restricted and not restricted

	1663 manager_->SetFeaturesRestricted(InputMethodManager::FeaturesRestricted::VOICE,

	1664 true);

	1665 EXPECT_TRUE(manager_->GetFeaturesRestricted(

	1666 InputMethodManager::FeaturesRestricted::VOICE));

	1667 manager_->SetFeaturesRestricted(InputMethodManager::FeaturesRestricted::VOICE,

	1668 false);

	1669 EXPECT_TRUE(manager_->GetFeaturesRestricted(

	1670 InputMethodManager::FeaturesRestricted::NONE));

	1671

	1672 // Sets handwriting restricted and not restricted

	1673 manager_->SetFeaturesRestricted(

	1674 InputMethodManager::FeaturesRestricted::HANDWRITING, true);

	1675 EXPECT_TRUE(manager_->GetFeaturesRestricted(

	1676 InputMethodManager::FeaturesRestricted::HANDWRITING));

	1677 manager_->SetFeaturesRestricted(

	1678 InputMethodManager::FeaturesRestricted::HANDWRITING, false);

	1679 EXPECT_TRUE(manager_->GetFeaturesRestricted(

	1680 InputMethodManager::FeaturesRestricted::NONE));

	1681 }

	1682

	1683 TEST_F(InputMethodManagerImplTest, SetMoreThanOneFeaturesRestricted) {

	1684 EXPECT_TRUE(manager_->GetFeaturesRestricted(

	1685 InputMethodManager::FeaturesRestricted::NONE));

	1686

	1687 // Sets emoji and voice restricted

	1688 manager_->SetFeaturesRestricted(InputMethodManager::FeaturesRestricted::EMOJI,

	1689 true);

	1690 manager_->SetFeaturesRestricted(InputMethodManager::FeaturesRestricted::VOICE,

	1691 true);

	1692 EXPECT_TRUE(manager_->GetFeaturesRestricted(

	1693 InputMethodManager::FeaturesRestricted::EMOJI));

	1694 EXPECT_TRUE(manager_->GetFeaturesRestricted(

	1695 InputMethodManager::FeaturesRestricted::VOICE));

	1696 // Sets emoji not restricted

	1697 manager_->SetFeaturesRestricted(InputMethodManager::FeaturesRestricted::EMOJI,

	1698 false);

	1699 manager_->SetFeaturesRestricted(InputMethodManager::FeaturesRestricted::VOICE,

	1700 true);

	1701 EXPECT_FALSE(manager_->GetFeaturesRestricted(

	1702 InputMethodManager::FeaturesRestricted::EMOJI));

	1703

	1704 // Sets voice not restricted

	1705 manager_->SetFeaturesRestricted(InputMethodManager::FeaturesRestricted::VOICE,

	1706 false);

	1707 EXPECT_TRUE(manager_->GetFeaturesRestricted(

	1708 InputMethodManager::FeaturesRestricted::NONE));

	1709 }

	1710

	1711 TEST_F(InputMethodManagerImplTest, SetAllFeaturesRestricted) {

	1712 EXPECT_TRUE(manager_->GetFeaturesRestricted(

	1713 InputMethodManager::FeaturesRestricted::NONE));

	1714

	1715 // Sets all restricted

	1716 manager_->SetFeaturesRestricted(InputMethodManager::FeaturesRestricted::EMOJI,

	1717 true);

	1718 manager_->SetFeaturesRestricted(InputMethodManager::FeaturesRestricted::VOICE,

	1719 true);

	1720 manager_->SetFeaturesRestricted(

	1721 InputMethodManager::FeaturesRestricted::HANDWRITING, true);

	1722

	1723 EXPECT_TRUE(manager_->GetFeaturesRestricted(

	1724 InputMethodManager::FeaturesRestricted::EMOJI));

	1725 EXPECT_TRUE(manager_->GetFeaturesRestricted(

	1726 InputMethodManager::FeaturesRestricted::VOICE));

	1727 EXPECT_TRUE(manager_->GetFeaturesRestricted(

	1728 InputMethodManager::FeaturesRestricted::HANDWRITING));

	1729

	1730 // Sets all not restricted

	1731 manager_->SetFeaturesRestricted(InputMethodManager::FeaturesRestricted::EMOJI,

	1732 false);

	1733 manager_->SetFeaturesRestricted(InputMethodManager::FeaturesRestricted::VOICE,

	1734 false);

	1735 manager_->SetFeaturesRestricted(

	1736 InputMethodManager::FeaturesRestricted::HANDWRITING, false);

	1737 EXPECT_FALSE(manager_->GetFeaturesRestricted(

	1738 InputMethodManager::FeaturesRestricted::EMOJI));

	1739 EXPECT_FALSE(manager_->GetFeaturesRestricted(

	1740 InputMethodManager::FeaturesRestricted::VOICE));

	1741 EXPECT_FALSE(manager_->GetFeaturesRestricted(

	1742 InputMethodManager::FeaturesRestricted::HANDWRITING));

	1743 EXPECT_TRUE(manager_->GetFeaturesRestricted(

	1744 InputMethodManager::FeaturesRestricted::NONE));

	1745 }

	1746

1648 } // namespace input_method	1747 } // namespace input_method

1649 } // namespace chromeos	1748 } // namespace chromeos

OLD	NEW