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

Side by Side Diff: ash/ime/mode_indicator_view.cc

Issue 194843004: Move files from ui/views/corewm to ui/wm/core (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 9 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ash/ime/infolist_window.cc ('k') | ash/magnifier/magnification_controller.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/mode_indicator_view.h" 5 #include "ash/ime/mode_indicator_view.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "ui/gfx/display.h" 8 #include "ui/gfx/display.h"
9 #include "ui/gfx/screen.h" 9 #include "ui/gfx/screen.h"
10 #include "ui/views/bubble/bubble_delegate.h" 10 #include "ui/views/bubble/bubble_delegate.h"
11 #include "ui/views/bubble/bubble_frame_view.h" 11 #include "ui/views/bubble/bubble_frame_view.h"
12 #include "ui/views/controls/label.h" 12 #include "ui/views/controls/label.h"
13 #include "ui/views/corewm/window_animations.h"
14 #include "ui/views/layout/fill_layout.h" 13 #include "ui/views/layout/fill_layout.h"
14 #include "ui/wm/core/window_animations.h"
15 15
16 namespace ash { 16 namespace ash {
17 namespace ime { 17 namespace ime {
18 18
19 namespace { 19 namespace {
20 // Minimum size of inner contents in pixel. 20 // Minimum size of inner contents in pixel.
21 // 43 is the designed size including the default margin (6 * 2). 21 // 43 is the designed size including the default margin (6 * 2).
22 const int kMinSize = 31; 22 const int kMinSize = 31;
23 23
24 // After this duration in msec, the mode inicator will be fading out. 24 // After this duration in msec, the mode inicator will be fading out.
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 views::BubbleFrameView* frame = new ModeIndicatorFrameView(margins()); 90 views::BubbleFrameView* frame = new ModeIndicatorFrameView(margins());
91 // arrow adjustment in BubbleDelegateView is unnecessary because arrow 91 // arrow adjustment in BubbleDelegateView is unnecessary because arrow
92 // of this bubble is always center. 92 // of this bubble is always center.
93 frame->SetBubbleBorder(scoped_ptr<views::BubbleBorder>( 93 frame->SetBubbleBorder(scoped_ptr<views::BubbleBorder>(
94 new views::BubbleBorder(arrow(), shadow(), color()))); 94 new views::BubbleBorder(arrow(), shadow(), color())));
95 return frame; 95 return frame;
96 } 96 }
97 97
98 } // namespace ime 98 } // namespace ime
99 } // namespace ash 99 } // namespace ash
OLDNEW
« no previous file with comments | « ash/ime/infolist_window.cc ('k') | ash/magnifier/magnification_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698