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 "base/macros.h" |
9 #include "ui/gfx/display.h" | 9 #include "ui/gfx/display.h" |
10 #include "ui/gfx/screen.h" | 10 #include "ui/gfx/screen.h" |
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
86 AddChildView(label_view_); | 86 AddChildView(label_view_); |
87 | 87 |
88 SetAnchorRect(cursor_bounds_); | 88 SetAnchorRect(cursor_bounds_); |
89 } | 89 } |
90 | 90 |
91 views::NonClientFrameView* ModeIndicatorView::CreateNonClientFrameView( | 91 views::NonClientFrameView* ModeIndicatorView::CreateNonClientFrameView( |
92 views::Widget* widget) { | 92 views::Widget* widget) { |
93 views::BubbleFrameView* frame = new ModeIndicatorFrameView(margins()); | 93 views::BubbleFrameView* frame = new ModeIndicatorFrameView(margins()); |
94 // arrow adjustment in BubbleDelegateView is unnecessary because arrow | 94 // arrow adjustment in BubbleDelegateView is unnecessary because arrow |
95 // of this bubble is always center. | 95 // of this bubble is always center. |
96 frame->SetBubbleBorder(scoped_ptr<views::BubbleBorder>( | 96 frame->SetBubbleBorder(std::unique_ptr<views::BubbleBorder>( |
97 new views::BubbleBorder(arrow(), shadow(), color()))); | 97 new views::BubbleBorder(arrow(), shadow(), color()))); |
98 return frame; | 98 return frame; |
99 } | 99 } |
100 | 100 |
101 } // namespace ime | 101 } // namespace ime |
102 } // namespace ui | 102 } // namespace ui |
OLD | NEW |