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

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

Issue 621133002: replace OVERRIDE and FINAL with override and final in ash/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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
« no previous file with comments | « ash/ime/mode_indicator_view.h ('k') | ash/keyboard_overlay/keyboard_overlay_delegate.h » ('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"
(...skipping 14 matching lines...) Expand all
25 const int kShowingDuration = 500; 25 const int kShowingDuration = 500;
26 26
27 class ModeIndicatorFrameView : public views::BubbleFrameView { 27 class ModeIndicatorFrameView : public views::BubbleFrameView {
28 public: 28 public:
29 explicit ModeIndicatorFrameView(const gfx::Insets& content_margins) 29 explicit ModeIndicatorFrameView(const gfx::Insets& content_margins)
30 : views::BubbleFrameView(content_margins) {} 30 : views::BubbleFrameView(content_margins) {}
31 virtual ~ModeIndicatorFrameView() {} 31 virtual ~ModeIndicatorFrameView() {}
32 32
33 private: 33 private:
34 // views::BubbleFrameView overrides: 34 // views::BubbleFrameView overrides:
35 virtual gfx::Rect GetAvailableScreenBounds(const gfx::Rect& rect) OVERRIDE { 35 virtual gfx::Rect GetAvailableScreenBounds(const gfx::Rect& rect) override {
36 return gfx::Screen::GetNativeScreen()->GetDisplayNearestPoint( 36 return gfx::Screen::GetNativeScreen()->GetDisplayNearestPoint(
37 rect.CenterPoint()).bounds(); 37 rect.CenterPoint()).bounds();
38 } 38 }
39 39
40 DISALLOW_COPY_AND_ASSIGN(ModeIndicatorFrameView); 40 DISALLOW_COPY_AND_ASSIGN(ModeIndicatorFrameView);
41 }; 41 };
42 42
43 } // namespace 43 } // namespace
44 44
45 45
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 views::BubbleFrameView* frame = new ModeIndicatorFrameView(margins()); 86 views::BubbleFrameView* frame = new ModeIndicatorFrameView(margins());
87 // arrow adjustment in BubbleDelegateView is unnecessary because arrow 87 // arrow adjustment in BubbleDelegateView is unnecessary because arrow
88 // of this bubble is always center. 88 // of this bubble is always center.
89 frame->SetBubbleBorder(scoped_ptr<views::BubbleBorder>( 89 frame->SetBubbleBorder(scoped_ptr<views::BubbleBorder>(
90 new views::BubbleBorder(arrow(), shadow(), color()))); 90 new views::BubbleBorder(arrow(), shadow(), color())));
91 return frame; 91 return frame;
92 } 92 }
93 93
94 } // namespace ime 94 } // namespace ime
95 } // namespace ash 95 } // namespace ash
OLDNEW
« no previous file with comments | « ash/ime/mode_indicator_view.h ('k') | ash/keyboard_overlay/keyboard_overlay_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698