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

Side by Side Diff: chrome/browser/chromeos/status/input_method_menu_button_browsertest.cc

Issue 9570044: Rename chrome/browser/ui/views/{aura => ash}/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 years, 9 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
OLDNEW
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/status/status_area_view.h"
11 #include "chrome/browser/chromeos/view_ids.h" 11 #include "chrome/browser/chromeos/view_ids.h"
12 #include "chrome/browser/ui/browser.h" 12 #include "chrome/browser/ui/browser.h"
13 #include "chrome/browser/ui/browser_window.h" 13 #include "chrome/browser/ui/browser_window.h"
14 #include "grit/theme_resources.h" 14 #include "grit/theme_resources.h"
15 15
16 #if defined(USE_AURA) 16 #if defined(USE_AURA)
17 #include "chrome/browser/ui/views/aura/chrome_shell_delegate.h" 17 #include "chrome/browser/ui/views/ash/chrome_shell_delegate.h"
18 #endif 18 #endif
19 19
20 namespace chromeos { 20 namespace chromeos {
21 21
22 class InputMethodMenuButtonTest : public CrosInProcessBrowserTest { 22 class InputMethodMenuButtonTest : public CrosInProcessBrowserTest {
23 protected: 23 protected:
24 InputMethodMenuButtonTest() 24 InputMethodMenuButtonTest()
25 : CrosInProcessBrowserTest() { 25 : CrosInProcessBrowserTest() {
26 } 26 }
27 27
(...skipping 17 matching lines...) Expand all
45 IN_PROC_BROWSER_TEST_F(InputMethodMenuButtonTest, InitialIndicatorTest) { 45 IN_PROC_BROWSER_TEST_F(InputMethodMenuButtonTest, InitialIndicatorTest) {
46 const InputMethodMenuButton* input_method = GetInputMethodMenuButton(); 46 const InputMethodMenuButton* input_method = GetInputMethodMenuButton();
47 ASSERT_TRUE(input_method != NULL); 47 ASSERT_TRUE(input_method != NULL);
48 48
49 // 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
50 // to US for tests. 50 // to US for tests.
51 EXPECT_EQ(ASCIIToUTF16("US"), input_method->text()); 51 EXPECT_EQ(ASCIIToUTF16("US"), input_method->text());
52 } 52 }
53 53
54 } // namespace chromeos 54 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698