OLD | NEW |
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 "ui/chromeos/ime/mode_indicator_view.h" | 5 #include "ui/chromeos/ime/mode_indicator_view.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "base/macros.h" |
8 #include "ui/gfx/display.h" | 9 #include "ui/gfx/display.h" |
9 #include "ui/gfx/screen.h" | 10 #include "ui/gfx/screen.h" |
10 #include "ui/views/bubble/bubble_delegate.h" | 11 #include "ui/views/bubble/bubble_delegate.h" |
11 #include "ui/views/bubble/bubble_frame_view.h" | 12 #include "ui/views/bubble/bubble_frame_view.h" |
12 #include "ui/views/controls/label.h" | 13 #include "ui/views/controls/label.h" |
13 #include "ui/views/layout/fill_layout.h" | 14 #include "ui/views/layout/fill_layout.h" |
14 #include "ui/wm/core/window_animations.h" | 15 #include "ui/wm/core/window_animations.h" |
15 | 16 |
16 namespace ui { | 17 namespace ui { |
17 namespace ime { | 18 namespace ime { |
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
90 views::BubbleFrameView* frame = new ModeIndicatorFrameView(margins()); | 91 views::BubbleFrameView* frame = new ModeIndicatorFrameView(margins()); |
91 // arrow adjustment in BubbleDelegateView is unnecessary because arrow | 92 // arrow adjustment in BubbleDelegateView is unnecessary because arrow |
92 // of this bubble is always center. | 93 // of this bubble is always center. |
93 frame->SetBubbleBorder(scoped_ptr<views::BubbleBorder>( | 94 frame->SetBubbleBorder(scoped_ptr<views::BubbleBorder>( |
94 new views::BubbleBorder(arrow(), shadow(), color()))); | 95 new views::BubbleBorder(arrow(), shadow(), color()))); |
95 return frame; | 96 return frame; |
96 } | 97 } |
97 | 98 |
98 } // namespace ime | 99 } // namespace ime |
99 } // namespace ui | 100 } // namespace ui |
OLD | NEW |