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

Side by Side Diff: ui/chromeos/ime/candidate_view.cc

Issue 680383008: Move ash/ime to ui/chromeos/ime (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@athena_do_not_use_ash48_global_command
Patch Set: Created 6 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "ash/ime/candidate_view.h"
6
7 #include "ash/ime/candidate_window_constants.h"
8 #include "base/strings/utf_string_conversions.h" 5 #include "base/strings/utf_string_conversions.h"
9 #include "ui/base/ime/candidate_window.h" 6 #include "ui/base/ime/candidate_window.h"
7 #include "ui/chromeos/ime/candidate_view.h"
8 #include "ui/chromeos/ime/candidate_window_constants.h"
10 #include "ui/gfx/color_utils.h" 9 #include "ui/gfx/color_utils.h"
11 #include "ui/native_theme/native_theme.h" 10 #include "ui/native_theme/native_theme.h"
12 #include "ui/views/background.h" 11 #include "ui/views/background.h"
13 #include "ui/views/border.h" 12 #include "ui/views/border.h"
14 #include "ui/views/controls/label.h" 13 #include "ui/views/controls/label.h"
15 #include "ui/views/widget/widget.h" 14 #include "ui/views/widget/widget.h"
16 15
17 namespace ash { 16 namespace ui {
18 namespace ime { 17 namespace ime {
19 18
20 namespace { 19 namespace {
21 20
22 // VerticalCandidateLabel is used for rendering candidate text in 21 // VerticalCandidateLabel is used for rendering candidate text in
23 // the vertical candidate window. 22 // the vertical candidate window.
24 class VerticalCandidateLabel : public views::Label { 23 class VerticalCandidateLabel : public views::Label {
25 public: 24 public:
26 VerticalCandidateLabel() {} 25 VerticalCandidateLabel() {}
27 26
(...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after
291 size.SetToMax(annotation_size); 290 size.SetToMax(annotation_size);
292 } 291 }
293 292
294 // Reserves the margin for infolist_icon even if it's not visible. 293 // Reserves the margin for infolist_icon even if it's not visible.
295 size.Enlarge( 294 size.Enlarge(
296 kInfolistIndicatorIconWidth + kInfolistIndicatorIconPadding * 2, 0); 295 kInfolistIndicatorIconWidth + kInfolistIndicatorIconPadding * 2, 0);
297 return size; 296 return size;
298 } 297 }
299 298
300 } // namespace ime 299 } // namespace ime
301 } // namespace ash 300 } // namespace ui
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698