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

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

Issue 8585043: chromeos: Fix a clang build error in CandidateWindowView. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 1 month 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 | « no previous file | chrome/browser/chromeos/input_method/candidate_window_view.h » ('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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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
(...skipping 818 matching lines...) Expand 10 before | Expand all | Expand 10 after
829 parent_frame_(parent_frame), 829 parent_frame_(parent_frame),
830 preedit_area_(NULL), 830 preedit_area_(NULL),
831 header_area_(NULL), 831 header_area_(NULL),
832 candidate_area_(NULL), 832 candidate_area_(NULL),
833 footer_area_(NULL), 833 footer_area_(NULL),
834 previous_shortcut_column_width_(0), 834 previous_shortcut_column_width_(0),
835 previous_candidate_column_width_(0), 835 previous_candidate_column_width_(0),
836 previous_annotation_column_width_(0) { 836 previous_annotation_column_width_(0) {
837 } 837 }
838 838
839 CandidateWindowView::~CandidateWindowView() {
840 }
841
839 void CandidateWindowView::Init() { 842 void CandidateWindowView::Init() {
840 // Set the background and the border of the view. 843 // Set the background and the border of the view.
841 set_background( 844 set_background(
842 views::Background::CreateSolidBackground(kDefaultBackgroundColor)); 845 views::Background::CreateSolidBackground(kDefaultBackgroundColor));
843 set_border(views::Border::CreateSolidBorder(1, kFrameColor)); 846 set_border(views::Border::CreateSolidBorder(1, kFrameColor));
844 847
845 // Create areas. 848 // Create areas.
846 preedit_area_ = new InformationTextArea(views::Label::ALIGN_LEFT, 849 preedit_area_ = new InformationTextArea(views::Label::ALIGN_LEFT,
847 kMinPreeditAreaWidth); 850 kMinPreeditAreaWidth);
848 header_area_ = new InformationTextArea(views::Label::ALIGN_LEFT, 0); 851 header_area_ = new InformationTextArea(views::Label::ALIGN_LEFT, 0);
(...skipping 826 matching lines...) Expand 10 before | Expand all | Expand 10 after
1675 CandidateWindowController::~CandidateWindowController() { 1678 CandidateWindowController::~CandidateWindowController() {
1676 delete impl_; 1679 delete impl_;
1677 } 1680 }
1678 1681
1679 bool CandidateWindowController::Init() { 1682 bool CandidateWindowController::Init() {
1680 return impl_->Init(); 1683 return impl_->Init();
1681 } 1684 }
1682 1685
1683 } // namespace input_method 1686 } // namespace input_method
1684 } // namespace chromeos 1687 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/input_method/candidate_window_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698