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

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

Issue 5104002: Cleanup: Include browser.h -> ui/browser.h [Part 4]. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 10 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/string_util.h" 7 #include "base/string_util.h"
8 #include "chrome/browser/browser.h"
9 #include "chrome/browser/browser_window.h"
10 #include "chrome/browser/chromeos/cros/cros_in_process_browser_test.h" 8 #include "chrome/browser/chromeos/cros/cros_in_process_browser_test.h"
11 #include "chrome/browser/chromeos/cros/mock_input_method_library.h" 9 #include "chrome/browser/chromeos/cros/mock_input_method_library.h"
12 #include "chrome/browser/chromeos/frame/browser_view.h" 10 #include "chrome/browser/chromeos/frame/browser_view.h"
13 #include "chrome/browser/chromeos/status/status_area_view.h" 11 #include "chrome/browser/chromeos/status/status_area_view.h"
14 #include "chrome/browser/chromeos/view_ids.h" 12 #include "chrome/browser/chromeos/view_ids.h"
13 #include "chrome/browser/ui/browser.h"
14 #include "chrome/browser/ui/browser_window.h"
15 #include "grit/theme_resources.h" 15 #include "grit/theme_resources.h"
16 16
17 namespace chromeos { 17 namespace chromeos {
18 18
19 class InputMethodMenuButtonTest : public CrosInProcessBrowserTest { 19 class InputMethodMenuButtonTest : public CrosInProcessBrowserTest {
20 protected: 20 protected:
21 InputMethodMenuButtonTest() 21 InputMethodMenuButtonTest()
22 : CrosInProcessBrowserTest() { 22 : CrosInProcessBrowserTest() {
23 } 23 }
24 24
(...skipping 13 matching lines...) Expand all
38 InputMethodMenuButton* input_method = GetInputMethodMenuButton(); 38 InputMethodMenuButton* input_method = GetInputMethodMenuButton();
39 ASSERT_TRUE(input_method != NULL); 39 ASSERT_TRUE(input_method != NULL);
40 40
41 // Since the default input method is "xkb:us::eng", "US" should be set for the 41 // Since the default input method is "xkb:us::eng", "US" should be set for the
42 // indicator. 42 // indicator.
43 std::wstring indicator = input_method->text(); 43 std::wstring indicator = input_method->text();
44 EXPECT_EQ(L"US", indicator); 44 EXPECT_EQ(L"US", indicator);
45 } 45 }
46 46
47 } // namespace chromeos 47 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/status/clock_menu_button_browsertest.cc ('k') | chrome/browser/chromeos/status/network_menu.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698