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

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

Issue 5854003: Remove CrOS hack from ppapi.gyp that made the include directories work. This... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/candidate_window.h" 5 #include "chrome/browser/chromeos/input_method/candidate_window.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/observer_list.h" 12 #include "base/observer_list.h"
13 #include "base/scoped_ptr.h" 13 #include "base/scoped_ptr.h"
14 #include "base/string_util.h" 14 #include "base/string_util.h"
15 #include "base/stringprintf.h" 15 #include "base/stringprintf.h"
16 #include "base/utf_string_conversions.h" 16 #include "base/utf_string_conversions.h"
17 #include "cros/chromeos_input_method_ui.h"
18 #include "gfx/canvas.h" 17 #include "gfx/canvas.h"
19 #include "gfx/font.h" 18 #include "gfx/font.h"
19 #include "third_party/cros/chromeos_input_method_ui.h"
20 #include "views/controls/label.h" 20 #include "views/controls/label.h"
21 #include "views/controls/textfield/textfield.h" 21 #include "views/controls/textfield/textfield.h"
22 #include "views/event.h" 22 #include "views/event.h"
23 #include "views/fill_layout.h" 23 #include "views/fill_layout.h"
24 #include "views/grid_layout.h" 24 #include "views/grid_layout.h"
25 #include "views/screen.h" 25 #include "views/screen.h"
26 #include "views/widget/root_view.h" 26 #include "views/widget/root_view.h"
27 #include "views/widget/widget.h" 27 #include "views/widget/widget.h"
28 #include "views/widget/widget_gtk.h" 28 #include "views/widget/widget_gtk.h"
29 #include "views/window/non_client_view.h" 29 #include "views/window/non_client_view.h"
(...skipping 1321 matching lines...) Expand 10 before | Expand all | Expand 10 after
1351 1351
1352 CandidateWindowController::~CandidateWindowController() { 1352 CandidateWindowController::~CandidateWindowController() {
1353 delete impl_; 1353 delete impl_;
1354 } 1354 }
1355 1355
1356 bool CandidateWindowController::Init() { 1356 bool CandidateWindowController::Init() {
1357 return impl_->Init(); 1357 return impl_->Init();
1358 } 1358 }
1359 1359
1360 } // namespace chromeos 1360 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/google_update_chromeos.cc ('k') | chrome/browser/chromeos/input_method/candidate_window_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698