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

Unified Diff: ash/ime/candidate_view.cc

Issue 145033006: views: Make View::set_border() take a scoped_ptr<>. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase to ToT Created 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ash/ime/candidate_window_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/ime/candidate_view.cc
diff --git a/ash/ime/candidate_view.cc b/ash/ime/candidate_view.cc
index 652998a8403e4fb548e2f762a4d7f8514129dc28..eaa790a9a4e6429fb7cc4ef3a35b2c9085fdd86b 100644
--- a/ash/ime/candidate_view.cc
+++ b/ash/ime/candidate_view.cc
@@ -73,7 +73,7 @@ views::Label* CreateShortcutLabel(
(orientation == ui::CandidateWindow::VERTICAL ?
kVerticalShortcutLabelInsets :
kHorizontalShortcutLabelInsets);
- shortcut_label->set_border(views::Border::CreateEmptyBorder(
+ shortcut_label->SetBorder(views::Border::CreateEmptyBorder(
insets.top(), insets.left(), insets.bottom(), insets.right()));
// Add decoration based on the orientation.
@@ -144,7 +144,7 @@ CandidateView::CandidateView(
candidate_label_(NULL),
annotation_label_(NULL),
infolist_icon_(NULL) {
- set_border(views::Border::CreateEmptyBorder(1, 1, 1, 1));
+ SetBorder(views::Border::CreateEmptyBorder(1, 1, 1, 1));
const ui::NativeTheme& theme = *GetNativeTheme();
shortcut_label_ = CreateShortcutLabel(orientation, theme);
@@ -198,9 +198,9 @@ void CandidateView::StateChanged() {
set_background(
views::Background::CreateSolidBackground(theme->GetSystemColor(
ui::NativeTheme::kColorId_TextfieldSelectionBackgroundFocused)));
- set_border(views::Border::CreateSolidBorder(
- 1, theme->GetSystemColor(
- ui::NativeTheme::kColorId_FocusedBorderColor)));
+ SetBorder(views::Border::CreateSolidBorder(
+ 1,
+ theme->GetSystemColor(ui::NativeTheme::kColorId_FocusedBorderColor)));
// Cancel currently focused one.
for (int i = 0; i < parent()->child_count(); ++i) {
@@ -211,7 +211,7 @@ void CandidateView::StateChanged() {
}
} else {
set_background(NULL);
- set_border(views::Border::CreateEmptyBorder(1, 1, 1, 1));
+ SetBorder(views::Border::CreateEmptyBorder(1, 1, 1, 1));
}
}
« no previous file with comments | « no previous file | ash/ime/candidate_window_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698