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

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

Issue 796693005: Update {virtual,override,final} to follow C++11 style in chrome/browser/chromeos/input_method. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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
OLDNEW
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_util.h" 5 #include "chrome/browser/chromeos/input_method/input_method_util.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 class InputMethodUtilTest : public testing::Test { 46 class InputMethodUtilTest : public testing::Test {
47 public: 47 public:
48 InputMethodUtilTest() 48 InputMethodUtilTest()
49 : util_(&delegate_, whitelist_.GetSupportedInputMethods()) { 49 : util_(&delegate_, whitelist_.GetSupportedInputMethods()) {
50 delegate_.set_get_localized_string_callback( 50 delegate_.set_get_localized_string_callback(
51 base::Bind(&l10n_util::GetStringUTF16)); 51 base::Bind(&l10n_util::GetStringUTF16));
52 delegate_.set_get_display_language_name_callback( 52 delegate_.set_get_display_language_name_callback(
53 base::Bind(&InputMethodUtilTest::GetDisplayLanguageName)); 53 base::Bind(&InputMethodUtilTest::GetDisplayLanguageName));
54 } 54 }
55 55
56 virtual void SetUp() override { 56 void SetUp() override {
57 InputMethodDescriptors input_methods; 57 InputMethodDescriptors input_methods;
58 58
59 std::vector<std::string> layouts; 59 std::vector<std::string> layouts;
60 std::vector<std::string> languages; 60 std::vector<std::string> languages;
61 layouts.push_back("us"); 61 layouts.push_back("us");
62 languages.push_back("zh-CN"); 62 languages.push_back("zh-CN");
63 63
64 InputMethodDescriptor pinyin_ime(Id(pinyin_ime_id), 64 InputMethodDescriptor pinyin_ime(Id(pinyin_ime_id),
65 "Pinyin input for testing", 65 "Pinyin input for testing",
66 "CN", 66 "CN",
(...skipping 427 matching lines...) Expand 10 before | Expand all | Expand 10 after
494 EXPECT_EQ("xkb:us::eng", extension_ime_util::GetComponentIDByInputMethodID( 494 EXPECT_EQ("xkb:us::eng", extension_ime_util::GetComponentIDByInputMethodID(
495 input_method_ids[0])); 495 input_method_ids[0]));
496 EXPECT_EQ("xkb:ru::rus", extension_ime_util::GetComponentIDByInputMethodID( 496 EXPECT_EQ("xkb:ru::rus", extension_ime_util::GetComponentIDByInputMethodID(
497 input_method_ids[1])); 497 input_method_ids[1]));
498 EXPECT_EQ("xkb:us::eng", extension_ime_util::GetComponentIDByInputMethodID( 498 EXPECT_EQ("xkb:us::eng", extension_ime_util::GetComponentIDByInputMethodID(
499 login_input_method_ids[0])); 499 login_input_method_ids[0]));
500 } 500 }
501 501
502 } // namespace input_method 502 } // namespace input_method
503 } // namespace chromeos 503 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698