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

Side by Side Diff: ui/message_center/views/message_center_bubble.cc

Issue 623293004: replace OVERRIDE and FINAL with override and final in ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/message_center/views/message_center_bubble.h" 5 #include "ui/message_center/views/message_center_bubble.h"
6 6
7 #include "ui/base/l10n/l10n_util.h" 7 #include "ui/base/l10n/l10n_util.h"
8 #include "ui/message_center/message_center_style.h" 8 #include "ui/message_center/message_center_style.h"
9 #include "ui/message_center/views/message_center_view.h" 9 #include "ui/message_center/views/message_center_view.h"
10 #include "ui/strings/grit/ui_strings.h" 10 #include "ui/strings/grit/ui_strings.h"
11 #include "ui/views/layout/fill_layout.h" 11 #include "ui/views/layout/fill_layout.h"
12 #include "ui/views/widget/widget.h" 12 #include "ui/views/widget/widget.h"
13 13
14 namespace message_center { 14 namespace message_center {
15 15
16 // ContentsView //////////////////////////////////////////////////////////////// 16 // ContentsView ////////////////////////////////////////////////////////////////
17 17
18 // Handles changes in MessageCenterView sizes. 18 // Handles changes in MessageCenterView sizes.
19 class ContentsView : public views::View { 19 class ContentsView : public views::View {
20 public: 20 public:
21 explicit ContentsView(MessageCenterBubble* bubble, views::View* contents); 21 explicit ContentsView(MessageCenterBubble* bubble, views::View* contents);
22 virtual ~ContentsView(); 22 virtual ~ContentsView();
23 23
24 // Overridden from views::View: 24 // Overridden from views::View:
25 virtual int GetHeightForWidth(int width) const OVERRIDE; 25 virtual int GetHeightForWidth(int width) const override;
26 26
27 protected: 27 protected:
28 // Overridden from views::View: 28 // Overridden from views::View:
29 virtual void ChildPreferredSizeChanged(View* child) OVERRIDE; 29 virtual void ChildPreferredSizeChanged(View* child) override;
30 30
31 private: 31 private:
32 base::WeakPtr<MessageCenterBubble> bubble_; 32 base::WeakPtr<MessageCenterBubble> bubble_;
33 33
34 DISALLOW_COPY_AND_ASSIGN(ContentsView); 34 DISALLOW_COPY_AND_ASSIGN(ContentsView);
35 }; 35 };
36 36
37 ContentsView::ContentsView(MessageCenterBubble* bubble, views::View* contents) 37 ContentsView::ContentsView(MessageCenterBubble* bubble, views::View* contents)
38 : bubble_(bubble->AsWeakPtr()) { 38 : bubble_(bubble->AsWeakPtr()) {
39 SetLayoutManager(new views::FillLayout()); 39 SetLayoutManager(new views::FillLayout());
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 } 134 }
135 135
136 void MessageCenterBubble::OnMouseExitedView() { 136 void MessageCenterBubble::OnMouseExitedView() {
137 } 137 }
138 138
139 size_t MessageCenterBubble::NumMessageViewsForTest() const { 139 size_t MessageCenterBubble::NumMessageViewsForTest() const {
140 return message_center_view_->NumMessageViewsForTest(); 140 return message_center_view_->NumMessageViewsForTest();
141 } 141 }
142 142
143 } // namespace message_center 143 } // namespace message_center
OLDNEW
« no previous file with comments | « ui/message_center/views/message_center_bubble.h ('k') | ui/message_center/views/message_center_button_bar.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698