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

Side by Side Diff: chrome/browser/chromeos/input_method/ibus_controller_impl.cc

Issue 10911269: Fix compilation problem for clang-3.0. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 3 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 | no next file » | 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 "chrome/browser/chromeos/input_method/ibus_controller_impl.h" 5 #include "chrome/browser/chromeos/input_method/ibus_controller_impl.h"
6 6
7 #include <algorithm> // for std::reverse. 7 #include <algorithm> // for std::reverse.
8 #include <cstdio> 8 #include <cstdio>
9 #include <cstring> // for std::strcmp. 9 #include <cstring> // for std::strcmp.
10 #include <set> 10 #include <set>
(...skipping 296 matching lines...) Expand 10 before | Expand all | Expand 10 after
307 return "INCONSISTENT"; 307 return "INCONSISTENT";
308 } 308 }
309 return "UNKNOWN"; 309 return "UNKNOWN";
310 } 310 }
311 311
312 // Debug print function. 312 // Debug print function.
313 std::string Spacer(int n) { 313 std::string Spacer(int n) {
314 return std::string(n, ' '); 314 return std::string(n, ' ');
315 } 315 }
316 316
317 std::string PrintPropList(IBusPropList *prop_list, int tree_level);
318
317 // Debug print function. 319 // Debug print function.
318 std::string PrintProp(IBusProperty *prop, int tree_level) { 320 std::string PrintProp(IBusProperty *prop, int tree_level) {
319 std::string PrintPropList(IBusPropList *prop_list, int tree_level);
320
321 if (!prop) 321 if (!prop)
322 return ""; 322 return "";
323 323
324 const IBusPropType type = ibus_property_get_prop_type(prop); 324 const IBusPropType type = ibus_property_get_prop_type(prop);
325 const IBusPropState state = ibus_property_get_state(prop); 325 const IBusPropState state = ibus_property_get_state(prop);
326 const IBusText* tooltip = ibus_property_get_tooltip(prop); 326 const IBusText* tooltip = ibus_property_get_tooltip(prop);
327 const IBusText* label = ibus_property_get_label(prop); 327 const IBusText* label = ibus_property_get_label(prop);
328 const gchar* key = ibus_property_get_key(prop); 328 const gchar* key = ibus_property_get_key(prop);
329 329
330 std::stringstream stream; 330 std::stringstream stream;
(...skipping 813 matching lines...) Expand 10 before | Expand all | Expand 10 after
1144 1144
1145 // static 1145 // static
1146 bool IBusControllerImpl::FindAndUpdatePropertyForTesting( 1146 bool IBusControllerImpl::FindAndUpdatePropertyForTesting(
1147 const chromeos::input_method::InputMethodProperty& new_prop, 1147 const chromeos::input_method::InputMethodProperty& new_prop,
1148 chromeos::input_method::InputMethodPropertyList* prop_list) { 1148 chromeos::input_method::InputMethodPropertyList* prop_list) {
1149 return FindAndUpdateProperty(new_prop, prop_list); 1149 return FindAndUpdateProperty(new_prop, prop_list);
1150 } 1150 }
1151 1151
1152 } // namespace input_method 1152 } // namespace input_method
1153 } // namespace chromeos 1153 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698