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

Side by Side Diff: ui/base/ime/win/imm32_manager.cc

Issue 111373008: Update some uses of char16 to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 12 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 | Annotate | Revision Log
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/win/imm32_manager.h" 5 #include "ui/base/ime/win/imm32_manager.h"
6 6
7 #include <atlbase.h> 7 #include <atlbase.h>
8 #include <atlcom.h> 8 #include <atlcom.h>
9 #include <msctf.h> 9 #include <msctf.h>
10 10
11 #include "base/basictypes.h" 11 #include "base/basictypes.h"
12 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
13 #include "base/strings/string16.h" 13 #include "base/strings/string16.h"
14 #include "base/strings/string_util.h" 14 #include "base/strings/string_util.h"
15 #include "base/strings/utf_string_conversions.h" 15 #include "base/strings/utf_string_conversions.h"
16 #include "base/win/scoped_comptr.h" 16 #include "base/win/scoped_comptr.h"
17 #include "third_party/skia/include/core/SkColor.h" 17 #include "third_party/skia/include/core/SkColor.h"
18 #include "ui/base/ime/composition_text.h" 18 #include "ui/base/ime/composition_text.h"
19 19
20 // "imm32.lib" is required by IMM32 APIs used in this file. 20 // "imm32.lib" is required by IMM32 APIs used in this file.
21 // NOTE(hbono): To comply with a comment from Darin, I have added 21 // NOTE(hbono): To comply with a comment from Darin, I have added
22 // this #pragma directive instead of adding "imm32.lib" to a project file. 22 // this #pragma directive instead of adding "imm32.lib" to a project file.
23 #pragma comment(lib, "imm32.lib") 23 #pragma comment(lib, "imm32.lib")
24 24
25 // Following code requires wchar_t to be same as char16. It should always be 25 // Following code requires wchar_t to be same as char16. It should always be
26 // true on Windows. 26 // true on Windows.
27 COMPILE_ASSERT(sizeof(wchar_t) == sizeof(char16), wchar_t__char16_diff); 27 COMPILE_ASSERT(sizeof(wchar_t) == sizeof(base::char16), wchar_t__char16_diff);
28 28
29 /////////////////////////////////////////////////////////////////////////////// 29 ///////////////////////////////////////////////////////////////////////////////
30 // IMM32Manager 30 // IMM32Manager
31 31
32 namespace { 32 namespace {
33 33
34 // Determines whether or not the given attribute represents a target 34 // Determines whether or not the given attribute represents a target
35 // (a.k.a. a selection). 35 // (a.k.a. a selection).
36 bool IsTargetAttribute(char attribute) { 36 bool IsTargetAttribute(char attribute) {
37 return (attribute == ATTR_TARGET_CONVERTED || 37 return (attribute == ATTR_TARGET_CONVERTED ||
(...skipping 595 matching lines...) Expand 10 before | Expand all | Expand 10 after
633 | IME_CMODE_KATAKANA 633 | IME_CMODE_KATAKANA
634 | IME_CMODE_FULLSHAPE); 634 | IME_CMODE_FULLSHAPE);
635 break; 635 break;
636 default: 636 default:
637 *open = FALSE; 637 *open = FALSE;
638 break; 638 break;
639 } 639 }
640 } 640 }
641 641
642 } // namespace ui 642 } // namespace ui
OLDNEW
« no previous file with comments | « ui/base/ime/remote_input_method_win_unittest.cc ('k') | ui/base/ime/win/tsf_text_store_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698