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

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

Issue 105193002: Replace string16 with base::string16. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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) 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 #include "chrome/browser/chromeos/input_method/candidate_window_view.h" 4 #include "chrome/browser/chromeos/input_method/candidate_window_view.h"
5 5
6 #include <string> 6 #include <string>
7 7
8 #include "ash/shell.h" 8 #include "ash/shell.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "chrome/browser/chromeos/input_method/candidate_view.h" 10 #include "chrome/browser/chromeos/input_method/candidate_view.h"
(...skipping 432 matching lines...) Expand 10 before | Expand all | Expand 10 after
443 infolist_icon_layout->StartRow(1.0, 0); // infolist_icon_ is resizable. 443 infolist_icon_layout->StartRow(1.0, 0); // infolist_icon_ is resizable.
444 // |infolist_icon_| is owned by |infolist_icon_wrapper|. 444 // |infolist_icon_| is owned by |infolist_icon_wrapper|.
445 infolist_icon_layout->AddView(infolist_icon_); 445 infolist_icon_layout->AddView(infolist_icon_);
446 infolist_icon_layout->AddPaddingRow(0, kInfolistIndicatorIconPadding); 446 infolist_icon_layout->AddPaddingRow(0, kInfolistIndicatorIconPadding);
447 // |infolist_icon_wrapper| is owned by |this|. 447 // |infolist_icon_wrapper| is owned by |this|.
448 layout->AddView(infolist_icon_wrapper); 448 layout->AddView(infolist_icon_wrapper);
449 } 449 }
450 UpdateLabelBackgroundColors(); 450 UpdateLabelBackgroundColors();
451 } 451 }
452 452
453 void CandidateView::SetCandidateText(const string16& text) { 453 void CandidateView::SetCandidateText(const base::string16& text) {
454 candidate_label_->SetText(text); 454 candidate_label_->SetText(text);
455 } 455 }
456 456
457 void CandidateView::SetShortcutText(const string16& text) { 457 void CandidateView::SetShortcutText(const base::string16& text) {
458 shortcut_label_->SetText(text); 458 shortcut_label_->SetText(text);
459 } 459 }
460 460
461 void CandidateView::SetAnnotationText(const string16& text) { 461 void CandidateView::SetAnnotationText(const base::string16& text) {
462 annotation_label_->SetText(text); 462 annotation_label_->SetText(text);
463 } 463 }
464 464
465 void CandidateView::SetInfolistIcon(bool enable) { 465 void CandidateView::SetInfolistIcon(bool enable) {
466 if (!infolist_icon_ || (infolist_icon_enabled_ == enable)) 466 if (!infolist_icon_ || (infolist_icon_enabled_ == enable))
467 return; 467 return;
468 infolist_icon_enabled_ = enable; 468 infolist_icon_enabled_ = enable;
469 infolist_icon_->set_background( 469 infolist_icon_->set_background(
470 enable ? 470 enable ?
471 views::Background::CreateSolidBackground(GetNativeTheme()->GetSystemColor( 471 views::Background::CreateSolidBackground(GetNativeTheme()->GetSystemColor(
(...skipping 560 matching lines...) Expand 10 before | Expand all | Expand 10 after
1032 1032
1033 void CandidateWindowView::OnBoundsChanged(const gfx::Rect& previous_bounds) { 1033 void CandidateWindowView::OnBoundsChanged(const gfx::Rect& previous_bounds) {
1034 // If the bounds(size) of candidate window is changed, 1034 // If the bounds(size) of candidate window is changed,
1035 // we should move the frame to the right position. 1035 // we should move the frame to the right position.
1036 View::OnBoundsChanged(previous_bounds); 1036 View::OnBoundsChanged(previous_bounds);
1037 ResizeAndMoveParentFrame(); 1037 ResizeAndMoveParentFrame();
1038 } 1038 }
1039 1039
1040 } // namespace input_method 1040 } // namespace input_method
1041 } // namespace chromeos 1041 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/input_method/candidate_view.h ('k') | chrome/browser/chromeos/input_method/infolist_window_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698