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

Side by Side Diff: ui/base/ime/remote_input_method_win_unittest.cc

Issue 117983002: Prefix string16 with base:: in ui/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 7 years 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
« no previous file with comments | « ui/base/ime/input_method_win.cc ('k') | ui/base/ime/win/imm32_manager.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "ui/base/ime/remote_input_method_win.h" 5 #include "ui/base/ime/remote_input_method_win.h"
6 6
7 #include <InputScope.h> 7 #include <InputScope.h>
8 8
9 #include <vector> 9 #include <vector>
10 10
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 private: 87 private:
88 // Overriden from DummyTextInputClient. 88 // Overriden from DummyTextInputClient.
89 virtual void SetCompositionText( 89 virtual void SetCompositionText(
90 const ui::CompositionText& composition) OVERRIDE { 90 const ui::CompositionText& composition) OVERRIDE {
91 ++call_count_set_composition_text_; 91 ++call_count_set_composition_text_;
92 } 92 }
93 virtual void InsertChar(char16 ch, int flags) OVERRIDE{ 93 virtual void InsertChar(char16 ch, int flags) OVERRIDE{
94 inserted_text_.append(1, ch); 94 inserted_text_.append(1, ch);
95 ++call_count_insert_char_; 95 ++call_count_insert_char_;
96 } 96 }
97 virtual void InsertText(const string16& text) OVERRIDE{ 97 virtual void InsertText(const base::string16& text) OVERRIDE{
98 inserted_text_.append(text); 98 inserted_text_.append(text);
99 ++call_count_insert_text_; 99 ++call_count_insert_text_;
100 } 100 }
101 virtual ui::TextInputType GetTextInputType() const OVERRIDE { 101 virtual ui::TextInputType GetTextInputType() const OVERRIDE {
102 return text_input_type_; 102 return text_input_type_;
103 } 103 }
104 virtual ui::TextInputMode GetTextInputMode() const OVERRIDE { 104 virtual ui::TextInputMode GetTextInputMode() const OVERRIDE {
105 return text_input_mode_; 105 return text_input_mode_;
106 } 106 }
107 virtual gfx::Rect GetCaretBounds() const { 107 virtual gfx::Rect GetCaretBounds() const {
(...skipping 738 matching lines...) Expand 10 before | Expand all | Expand 10 after
846 scoped_ptr<InputMethod> input_method(CreateRemoteInputMethodWin(&delegate_)); 846 scoped_ptr<InputMethod> input_method(CreateRemoteInputMethodWin(&delegate_));
847 input_method->AddObserver(&input_method_observer); 847 input_method->AddObserver(&input_method_observer);
848 848
849 EXPECT_EQ(0u, input_method_observer.on_input_method_destroyed_changed()); 849 EXPECT_EQ(0u, input_method_observer.on_input_method_destroyed_changed());
850 input_method.reset(); 850 input_method.reset();
851 EXPECT_EQ(1u, input_method_observer.on_input_method_destroyed_changed()); 851 EXPECT_EQ(1u, input_method_observer.on_input_method_destroyed_changed());
852 } 852 }
853 853
854 } // namespace 854 } // namespace
855 } // namespace ui 855 } // namespace ui
OLDNEW
« no previous file with comments | « ui/base/ime/input_method_win.cc ('k') | ui/base/ime/win/imm32_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698