OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/status/input_method_menu_button.h" | 5 #include "chrome/browser/chromeos/status/input_method_menu_button.h" |
6 | 6 |
7 #include "base/utf_string_conversions.h" | 7 #include "base/utf_string_conversions.h" |
8 #include "chrome/browser/chromeos/cros/cros_in_process_browser_test.h" | 8 #include "chrome/browser/chromeos/cros/cros_in_process_browser_test.h" |
9 #include "chrome/browser/chromeos/frame/browser_view.h" | 9 #include "chrome/browser/chromeos/frame/browser_view.h" |
| 10 #include "chrome/browser/chromeos/status/status_area_view.h" |
10 #include "chrome/browser/chromeos/view_ids.h" | 11 #include "chrome/browser/chromeos/view_ids.h" |
11 #include "chrome/browser/ui/browser.h" | 12 #include "chrome/browser/ui/browser.h" |
12 #include "chrome/browser/ui/browser_window.h" | 13 #include "chrome/browser/ui/browser_window.h" |
13 #include "grit/theme_resources.h" | 14 #include "grit/theme_resources.h" |
14 | 15 |
15 #if defined(USE_AURA) | 16 #if defined(USE_AURA) |
16 #include "chrome/browser/ui/views/aura/chrome_shell_delegate.h" | 17 #include "chrome/browser/ui/views/aura/chrome_shell_delegate.h" |
17 #endif | 18 #endif |
18 | 19 |
19 namespace chromeos { | 20 namespace chromeos { |
20 | 21 |
21 class InputMethodMenuButtonTest : public CrosInProcessBrowserTest { | 22 class InputMethodMenuButtonTest : public CrosInProcessBrowserTest { |
22 protected: | 23 protected: |
23 InputMethodMenuButtonTest() | 24 InputMethodMenuButtonTest() |
24 : CrosInProcessBrowserTest() { | 25 : CrosInProcessBrowserTest() { |
25 } | 26 } |
26 | 27 |
27 virtual void SetUpInProcessBrowserTestFixture() { | 28 virtual void SetUpInProcessBrowserTestFixture() { |
28 cros_mock_->InitStatusAreaMocks(); | 29 cros_mock_->InitStatusAreaMocks(); |
29 cros_mock_->SetStatusAreaMocksExpectations(); | 30 cros_mock_->SetStatusAreaMocksExpectations(); |
30 } | 31 } |
31 | 32 |
32 const InputMethodMenuButton* GetInputMethodMenuButton() { | 33 const InputMethodMenuButton* GetInputMethodMenuButton() { |
33 const views::View* view = | 34 const views::View* view = |
34 #if defined(USE_AURA) | 35 #if defined(USE_AURA) |
35 ChromeShellDelegate::instance()->GetStatusAreaForTest(); | 36 ChromeShellDelegate::instance()->GetStatusArea(); |
36 #else | 37 #else |
37 static_cast<BrowserView*>(browser()->window()); | 38 static_cast<BrowserView*>(browser()->window()); |
38 #endif | 39 #endif |
39 return static_cast<const InputMethodMenuButton*>( | 40 return static_cast<const InputMethodMenuButton*>( |
40 view->GetViewByID(VIEW_ID_STATUS_BUTTON_INPUT_METHOD)); | 41 view->GetViewByID(VIEW_ID_STATUS_BUTTON_INPUT_METHOD)); |
41 } | 42 } |
42 }; | 43 }; |
43 | 44 |
44 IN_PROC_BROWSER_TEST_F(InputMethodMenuButtonTest, InitialIndicatorTest) { | 45 IN_PROC_BROWSER_TEST_F(InputMethodMenuButtonTest, InitialIndicatorTest) { |
45 const InputMethodMenuButton* input_method = GetInputMethodMenuButton(); | 46 const InputMethodMenuButton* input_method = GetInputMethodMenuButton(); |
46 ASSERT_TRUE(input_method != NULL); | 47 ASSERT_TRUE(input_method != NULL); |
47 | 48 |
48 // By default, show the indicator of the hardware keyboard, which is set | 49 // By default, show the indicator of the hardware keyboard, which is set |
49 // to US for tests. | 50 // to US for tests. |
50 EXPECT_EQ(ASCIIToUTF16("US"), input_method->text()); | 51 EXPECT_EQ(ASCIIToUTF16("US"), input_method->text()); |
51 } | 52 } |
52 | 53 |
53 } // namespace chromeos | 54 } // namespace chromeos |
OLD | NEW |