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

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

Issue 11734021: Roll ICU and convert include style to standard Chromium style, (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 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
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/input_method_manager_impl.h" 5 #include "chrome/browser/chromeos/input_method/input_method_manager_impl.h"
6 6
7 #include <algorithm> // std::find 7 #include <algorithm> // std::find
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
11 #include "base/string_util.h" 11 #include "base/string_util.h"
12 #include "base/stringprintf.h" 12 #include "base/stringprintf.h"
13 #include "chrome/browser/chromeos/input_method/candidate_window_controller.h" 13 #include "chrome/browser/chromeos/input_method/candidate_window_controller.h"
14 #include "chrome/browser/chromeos/input_method/input_method_delegate.h" 14 #include "chrome/browser/chromeos/input_method/input_method_delegate.h"
15 #include "chrome/browser/chromeos/input_method/input_method_engine_ibus.h" 15 #include "chrome/browser/chromeos/input_method/input_method_engine_ibus.h"
16 #include "chrome/browser/chromeos/input_method/xkeyboard.h" 16 #include "chrome/browser/chromeos/input_method/xkeyboard.h"
17 #include "chrome/browser/chromeos/language_preferences.h" 17 #include "chrome/browser/chromeos/language_preferences.h"
18 #include "third_party/icu/public/common/unicode/uloc.h"
18 #include "ui/base/accelerators/accelerator.h" 19 #include "ui/base/accelerators/accelerator.h"
19 #include "unicode/uloc.h"
20 20
21 namespace chromeos { 21 namespace chromeos {
22 namespace input_method { 22 namespace input_method {
23 23
24 namespace { 24 namespace {
25 25
26 bool Contains(const std::vector<std::string>& container, 26 bool Contains(const std::vector<std::string>& container,
27 const std::string& value) { 27 const std::string& value) {
28 return std::find(container.begin(), container.end(), value) != 28 return std::find(container.begin(), container.end(), value) !=
29 container.end(); 29 container.end();
(...skipping 646 matching lines...) Expand 10 before | Expand all | Expand 10 after
676 candidate_window_controller_.reset( 676 candidate_window_controller_.reset(
677 CandidateWindowController::CreateCandidateWindowController()); 677 CandidateWindowController::CreateCandidateWindowController());
678 if (candidate_window_controller_->Init(ibus_controller_.get())) 678 if (candidate_window_controller_->Init(ibus_controller_.get()))
679 candidate_window_controller_->AddObserver(this); 679 candidate_window_controller_->AddObserver(this);
680 else 680 else
681 DVLOG(1) << "Failed to initialize the candidate window controller"; 681 DVLOG(1) << "Failed to initialize the candidate window controller";
682 } 682 }
683 683
684 } // namespace input_method 684 } // namespace input_method
685 } // namespace chromeos 685 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/cros/cert_library.cc ('k') | chrome/browser/chromeos/input_method/input_method_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698