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

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

Issue 11783053: Clean Up: Remove ibus namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 10 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
« no previous file with comments | « chromeos/dbus/ibus/ibus_panel_service_unittest.cc ('k') | chromeos/dbus/ibus/ibus_property.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_PROPERTY_H_ 5 #ifndef CHROMEOS_DBUS_IBUS_IBUS_PROPERTY_H_
6 #define CHROMEOS_DBUS_IBUS_IBUS_PROPERTY_H_ 6 #define CHROMEOS_DBUS_IBUS_IBUS_PROPERTY_H_
7 7
8 #include <string> 8 #include <string>
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/memory/scoped_vector.h" 10 #include "base/memory/scoped_vector.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 } // namespace dbus 16 } // namespace dbus
17 17
18 namespace chromeos { 18 namespace chromeos {
19 namespace ibus {
20 19
21 class IBusProperty; 20 class IBusProperty;
22 typedef ScopedVector<IBusProperty> IBusPropertyList; 21 typedef ScopedVector<IBusProperty> IBusPropertyList;
23 22
24 // Pops a IBusProperty from |reader|. 23 // Pops a IBusProperty from |reader|.
25 // Returns false if an error occurs. 24 // Returns false if an error occurs.
26 bool CHROMEOS_EXPORT PopIBusProperty(dbus::MessageReader* reader, 25 bool CHROMEOS_EXPORT PopIBusProperty(dbus::MessageReader* reader,
27 IBusProperty* property); 26 IBusProperty* property);
28 // Pops a IBusPropertyList from |reader|. 27 // Pops a IBusPropertyList from |reader|.
29 // Returns false if an error occurs. 28 // Returns false if an error occurs.
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 IBusPropertyType type_; 123 IBusPropertyType type_;
125 std::string label_; 124 std::string label_;
126 std::string tooltip_; 125 std::string tooltip_;
127 bool visible_; 126 bool visible_;
128 bool checked_; 127 bool checked_;
129 IBusPropertyList sub_properties_; 128 IBusPropertyList sub_properties_;
130 129
131 DISALLOW_COPY_AND_ASSIGN(IBusProperty); 130 DISALLOW_COPY_AND_ASSIGN(IBusProperty);
132 }; 131 };
133 132
134 } // namespace ibus
135 } // namespace chromeos 133 } // namespace chromeos
136 134
137 #endif // CHROMEOS_DBUS_IBUS_IBUS_PROPERTY_H_ 135 #endif // CHROMEOS_DBUS_IBUS_IBUS_PROPERTY_H_
OLDNEW
« no previous file with comments | « chromeos/dbus/ibus/ibus_panel_service_unittest.cc ('k') | chromeos/dbus/ibus/ibus_property.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698