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

Side by Side Diff: chromeos/dbus/ibus/ibus_text.h

Issue 10411006: Workaround: Wrap IBusText with ibus namespace. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 7 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
« no previous file with comments | « no previous file | chromeos/dbus/ibus/ibus_text.cc » ('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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 CHROMEOS_DBUS_IBUS_IBUS_TEXT_H_ 5 #ifndef CHROMEOS_DBUS_IBUS_IBUS_TEXT_H_
6 #define CHROMEOS_DBUS_IBUS_IBUS_TEXT_H_ 6 #define CHROMEOS_DBUS_IBUS_IBUS_TEXT_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
11 #include "chromeos/chromeos_export.h" 11 #include "chromeos/chromeos_export.h"
12 12
13 namespace dbus { 13 namespace dbus {
14 class MessageWriter; 14 class MessageWriter;
15 class MessageReader; 15 class MessageReader;
16 } // dbus 16 } // dbus
17 17
18 namespace chromeos { 18 namespace chromeos {
19 // TODO(nona): Remove ibus namespace after complete libibus removal.
20 namespace ibus {
19 21
20 // The IBusText is one of IBusObjects and it contains IBusAttrList object which 22 // The IBusText is one of IBusObjects and it contains IBusAttrList object which
21 // contains array of IBusAttribute object. The overview of each data strucutres 23 // contains array of IBusAttribute object. The overview of each data strucutres
22 // is as follows: 24 // is as follows:
23 // 25 //
24 // DATA STRUCTURE OVERVIEW: 26 // DATA STRUCTURE OVERVIEW:
25 // 27 //
26 // IBusAttribute: (signature is "uuuu") 28 // IBusAttribute: (signature is "uuuu")
27 // variant struct { 29 // variant struct {
28 // string "IBusAttribute" 30 // string "IBusAttribute"
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 std::vector<SelectionAttribute>* mutable_selection_attributes(); 139 std::vector<SelectionAttribute>* mutable_selection_attributes();
138 140
139 private: 141 private:
140 std::string text_; 142 std::string text_;
141 std::vector<UnderlineAttribute> underline_attributes_; 143 std::vector<UnderlineAttribute> underline_attributes_;
142 std::vector<SelectionAttribute> selection_attributes_; 144 std::vector<SelectionAttribute> selection_attributes_;
143 145
144 DISALLOW_COPY_AND_ASSIGN(IBusText); 146 DISALLOW_COPY_AND_ASSIGN(IBusText);
145 }; 147 };
146 148
149 } // namespace ibus
147 } // namespace chromeos 150 } // namespace chromeos
148 151
149 #endif // CHROMEOS_DBUS_IBUS_IBUS_TEXT_H_ 152 #endif // CHROMEOS_DBUS_IBUS_IBUS_TEXT_H_
OLDNEW
« no previous file with comments | « no previous file | chromeos/dbus/ibus/ibus_text.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698