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

Unified Diff: ui/base/ime/win/imm32_manager.h

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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/base/ime/remote_input_method_win_unittest.cc ('k') | ui/base/ime/win/imm32_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/ime/win/imm32_manager.h
diff --git a/ui/base/ime/win/imm32_manager.h b/ui/base/ime/win/imm32_manager.h
index 17892cb76408699a0be448836e2aa83ac5fb7136..d82c460d0c236d773ed266f22ed4b3ca17bc6b85 100644
--- a/ui/base/ime/win/imm32_manager.h
+++ b/ui/base/ime/win/imm32_manager.h
@@ -154,7 +154,7 @@ class UI_EXPORT IMM32Manager {
// the same parameter of a WM_IME_COMPOSITION message handler.
// This parameter is used for checking if the ongoing composition has
// its result string,
- // * result [out] (string16)
+ // * result [out] (base::string16)
// Represents the object contains the composition result.
// Return values
// * true
@@ -164,7 +164,7 @@ class UI_EXPORT IMM32Manager {
// Remarks
// This function is designed for being called from WM_IME_COMPOSITION
// message handlers.
- bool GetResult(HWND window_handle, LPARAM lparam, string16* result);
+ bool GetResult(HWND window_handle, LPARAM lparam, base::string16* result);
// Retrieves the current composition status of the ongoing composition.
// Parameters
@@ -274,7 +274,10 @@ class UI_EXPORT IMM32Manager {
void CompleteComposition(HWND window_handle, HIMC imm_context);
// Retrieves a string from the IMM.
- bool GetString(HIMC imm_context, WPARAM lparam, int type, string16* result);
+ bool GetString(HIMC imm_context,
+ WPARAM lparam,
+ int type,
+ base::string16* result);
private:
// Represents whether or not there is an ongoing composition in a browser
« no previous file with comments | « ui/base/ime/remote_input_method_win_unittest.cc ('k') | ui/base/ime/win/imm32_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698