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

Side by Side Diff: chrome/browser/chromeos/extensions/input_method_apitest_chromeos.cc

Issue 623293003: replace OVERRIDE and FINAL with override and final in chrome/browser/chromeos/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: run git cl format on echo_dialog_view.h Created 6 years, 2 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/extensions/extension_apitest.h" 5 #include "chrome/browser/extensions/extension_apitest.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
(...skipping 23 matching lines...) Expand all
34 registrar_.Add(this, 34 registrar_.Add(this,
35 extensions::NOTIFICATION_EXTENSION_TEST_MESSAGE, 35 extensions::NOTIFICATION_EXTENSION_TEST_MESSAGE,
36 content::NotificationService::AllSources()); 36 content::NotificationService::AllSources());
37 } 37 }
38 38
39 virtual ~TestListener() {} 39 virtual ~TestListener() {}
40 40
41 // Implements the content::NotificationObserver interface. 41 // Implements the content::NotificationObserver interface.
42 virtual void Observe(int type, 42 virtual void Observe(int type,
43 const content::NotificationSource& source, 43 const content::NotificationSource& source,
44 const content::NotificationDetails& details) OVERRIDE { 44 const content::NotificationDetails& details) override {
45 const std::string& content = *content::Details<std::string>(details).ptr(); 45 const std::string& content = *content::Details<std::string>(details).ptr();
46 if (content == kBackgroundReady) { 46 if (content == kBackgroundReady) {
47 // Initializes IMF for testing when receives ready message from 47 // Initializes IMF for testing when receives ready message from
48 // background. 48 // background.
49 chromeos::input_method::InputMethodManager* manager = 49 chromeos::input_method::InputMethodManager* manager =
50 chromeos::input_method::InputMethodManager::Get(); 50 chromeos::input_method::InputMethodManager::Get();
51 manager->GetInputMethodUtil()->InitXkbInputMethodsForTesting(); 51 manager->GetInputMethodUtil()->InitXkbInputMethodsForTesting();
52 52
53 std::vector<std::string> keyboard_layouts; 53 std::vector<std::string> keyboard_layouts;
54 keyboard_layouts.push_back( 54 keyboard_layouts.push_back(
55 chromeos::extension_ime_util::GetInputMethodIDByEngineID( 55 chromeos::extension_ime_util::GetInputMethodIDByEngineID(
56 kInitialInputMethodOnLoginScreen)); 56 kInitialInputMethodOnLoginScreen));
57 manager->GetActiveIMEState()->EnableLoginLayouts(kLoginScreenUILanguage, 57 manager->GetActiveIMEState()->EnableLoginLayouts(kLoginScreenUILanguage,
58 keyboard_layouts); 58 keyboard_layouts);
59 } 59 }
60 } 60 }
61 61
62 private: 62 private:
63 content::NotificationRegistrar registrar_; 63 content::NotificationRegistrar registrar_;
64 }; 64 };
65 65
66 class ExtensionInputMethodApiTest : public ExtensionApiTest { 66 class ExtensionInputMethodApiTest : public ExtensionApiTest {
67 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { 67 virtual void SetUpCommandLine(CommandLine* command_line) override {
68 ExtensionApiTest::SetUpCommandLine(command_line); 68 ExtensionApiTest::SetUpCommandLine(command_line);
69 command_line->AppendSwitchASCII( 69 command_line->AppendSwitchASCII(
70 extensions::switches::kWhitelistedExtensionID, 70 extensions::switches::kWhitelistedExtensionID,
71 "ilanclmaeigfpnmdlgelmhkpkegdioip"); 71 "ilanclmaeigfpnmdlgelmhkpkegdioip");
72 } 72 }
73 }; 73 };
74 74
75 } // namespace 75 } // namespace
76 76
77 IN_PROC_BROWSER_TEST_F(ExtensionInputMethodApiTest, Basic) { 77 IN_PROC_BROWSER_TEST_F(ExtensionInputMethodApiTest, Basic) {
78 // Listener for extension's background ready. 78 // Listener for extension's background ready.
79 TestListener listener; 79 TestListener listener;
80 80
81 ASSERT_TRUE(RunExtensionTest("input_method")) << message_; 81 ASSERT_TRUE(RunExtensionTest("input_method")) << message_;
82 } 82 }
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/extensions/input_method_api.h ('k') | chrome/browser/chromeos/extensions/input_method_event_router.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698