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

Side by Side Diff: ui/metro_viewer/ime_types.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 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 #ifndef UI_METRO_VIEWER_IME_TYPES_H_ 5 #ifndef UI_METRO_VIEWER_IME_TYPES_H_
6 #define UI_METRO_VIEWER_IME_TYPES_H_ 6 #define UI_METRO_VIEWER_IME_TYPES_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 10 matching lines...) Expand all
21 int32 end_offset; 21 int32 end_offset;
22 bool thick; 22 bool thick;
23 }; 23 };
24 24
25 // An equivalent to ui::CompositionText defined in 25 // An equivalent to ui::CompositionText defined in
26 // "ui/base/ime/composition_text.h". Redefined here to avoid dependency 26 // "ui/base/ime/composition_text.h". Redefined here to avoid dependency
27 // on ui.gyp from metro_driver.gyp. 27 // on ui.gyp from metro_driver.gyp.
28 struct Composition { 28 struct Composition {
29 Composition(); 29 Composition();
30 ~Composition(); 30 ~Composition();
31 string16 text; 31 base::string16 text;
32 int32 selection_start; 32 int32 selection_start;
33 int32 selection_end; 33 int32 selection_end;
34 std::vector<UnderlineInfo> underlines; 34 std::vector<UnderlineInfo> underlines;
35 }; 35 };
36 36
37 // An equivalent to Win32 RECT structure. This can be gfx::Rect but redefined 37 // An equivalent to Win32 RECT structure. This can be gfx::Rect but redefined
38 // here to avoid dependency on gfx.gyp from metro_driver.gyp. 38 // here to avoid dependency on gfx.gyp from metro_driver.gyp.
39 struct CharacterBounds { 39 struct CharacterBounds {
40 CharacterBounds(); 40 CharacterBounds();
41 int32 left; 41 int32 left;
42 int32 top; 42 int32 top;
43 int32 right; 43 int32 right;
44 int32 bottom; 44 int32 bottom;
45 }; 45 };
46 46
47 } // namespace metro_viewer 47 } // namespace metro_viewer
48 48
49 #endif // UI_METRO_VIEWER_IME_TYPES_H_ 49 #endif // UI_METRO_VIEWER_IME_TYPES_H_
OLDNEW
« no previous file with comments | « ui/message_center/views/notifier_settings_view.cc ('k') | ui/metro_viewer/metro_viewer_messages.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698