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

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

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 | « chromeos/dbus/ibus/ibus_text.h ('k') | chromeos/dbus/ibus/ibus_text_unittest.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 #include "chromeos/dbus/ibus/ibus_text.h" 5 #include "chromeos/dbus/ibus/ibus_text.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "chromeos/dbus/ibus/ibus_object.h" 8 #include "chromeos/dbus/ibus/ibus_object.h"
9 #include "dbus/message.h" 9 #include "dbus/message.h"
10 10
11 namespace chromeos { 11 namespace chromeos {
12 // TODO(nona): Remove ibus namespace after complete libibus removal.
13 namespace ibus {
12 14
13 namespace { 15 namespace {
14 const uint32 kAttributeUnderline = 1; // Indicates underline attribute. 16 const uint32 kAttributeUnderline = 1; // Indicates underline attribute.
15 const uint32 kAttributeSelection = 2; // Indicates background attribute. 17 const uint32 kAttributeSelection = 2; // Indicates background attribute.
16 18
17 struct IBusAttribute { 19 struct IBusAttribute {
18 IBusAttribute() : type(0), value(0), start_index(0), end_index(0) {} 20 IBusAttribute() : type(0), value(0), start_index(0), end_index(0) {}
19 uint32 type; 21 uint32 type;
20 uint32 value; 22 uint32 value;
21 uint32 start_index; 23 uint32 start_index;
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 std::vector<IBusText::SelectionAttribute>* 183 std::vector<IBusText::SelectionAttribute>*
182 IBusText::mutable_selection_attributes() { 184 IBusText::mutable_selection_attributes() {
183 return &selection_attributes_; 185 return &selection_attributes_;
184 } 186 }
185 187
186 const std::vector<IBusText::SelectionAttribute>& 188 const std::vector<IBusText::SelectionAttribute>&
187 IBusText::selection_attributes() const { 189 IBusText::selection_attributes() const {
188 return selection_attributes_; 190 return selection_attributes_;
189 } 191 }
190 192
193 } // namespace ibus
191 } // namespace chromeos 194 } // namespace chromeos
OLDNEW
« no previous file with comments | « chromeos/dbus/ibus/ibus_text.h ('k') | chromeos/dbus/ibus/ibus_text_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698