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

Side by Side Diff: chrome/browser/chromeos/input_method/input_method_engine_browsertests.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "ash/ime/input_method_menu_item.h" 5 #include "ash/ime/input_method_menu_item.h"
6 #include "ash/ime/input_method_menu_manager.h" 6 #include "ash/ime/input_method_menu_manager.h"
7 #include "base/bind_helpers.h" 7 #include "base/bind_helpers.h"
8 #include "base/strings/stringprintf.h" 8 #include "base/strings/stringprintf.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "chrome/browser/extensions/extension_browsertest.h" 10 #include "chrome/browser/extensions/extension_browsertest.h"
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 }; 43 };
44 44
45 class InputMethodEngineBrowserTest 45 class InputMethodEngineBrowserTest
46 : public ExtensionBrowserTest, 46 : public ExtensionBrowserTest,
47 public ::testing::WithParamInterface<TestType> { 47 public ::testing::WithParamInterface<TestType> {
48 public: 48 public:
49 InputMethodEngineBrowserTest() 49 InputMethodEngineBrowserTest()
50 : ExtensionBrowserTest() {} 50 : ExtensionBrowserTest() {}
51 virtual ~InputMethodEngineBrowserTest() {} 51 virtual ~InputMethodEngineBrowserTest() {}
52 52
53 virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { 53 virtual void SetUpInProcessBrowserTestFixture() override {
54 ExtensionBrowserTest::SetUpInProcessBrowserTestFixture(); 54 ExtensionBrowserTest::SetUpInProcessBrowserTestFixture();
55 } 55 }
56 56
57 virtual void TearDownInProcessBrowserTestFixture() OVERRIDE { 57 virtual void TearDownInProcessBrowserTestFixture() override {
58 extension_ = NULL; 58 extension_ = NULL;
59 } 59 }
60 60
61 protected: 61 protected:
62 void LoadTestInputMethod() { 62 void LoadTestInputMethod() {
63 // This will load "chrome/test/data/extensions/input_ime" 63 // This will load "chrome/test/data/extensions/input_ime"
64 ExtensionTestMessageListener ime_ready_listener("ReadyToUseImeEvent", 64 ExtensionTestMessageListener ime_ready_listener("ReadyToUseImeEvent",
65 false); 65 false);
66 extension_ = LoadExtensionWithType("input_ime", GetParam()); 66 extension_ = LoadExtensionWithType("input_ime", GetParam());
67 ASSERT_TRUE(extension_); 67 ASSERT_TRUE(extension_);
(...skipping 908 matching lines...) Expand 10 before | Expand all | Expand 10 after
976 } 976 }
977 } 977 }
978 978
979 IMEBridge::Get()->SetInputContextHandler(NULL); 979 IMEBridge::Get()->SetInputContextHandler(NULL);
980 IMEBridge::Get()->SetCandidateWindowHandler(NULL); 980 IMEBridge::Get()->SetCandidateWindowHandler(NULL);
981 } 981 }
982 982
983 } // namespace 983 } // namespace
984 } // namespace input_method 984 } // namespace input_method
985 } // namespace chromeos 985 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698