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

Side by Side Diff: ui/app_list/views/app_list_main_view.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/app_list/views/app_list_main_view.h" 5 #include "ui/app_list/views/app_list_main_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 public: 50 public:
51 SearchBoxContainerView(AppListMainView* host, SearchBoxView* search_box) 51 SearchBoxContainerView(AppListMainView* host, SearchBoxView* search_box)
52 : host_(host), search_box_(search_box) { 52 : host_(host), search_box_(search_box) {
53 SetLayoutManager(new views::FillLayout()); 53 SetLayoutManager(new views::FillLayout());
54 AddChildView(search_box); 54 AddChildView(search_box);
55 } 55 }
56 virtual ~SearchBoxContainerView() {} 56 virtual ~SearchBoxContainerView() {}
57 57
58 private: 58 private:
59 // Overridden from views::View: 59 // Overridden from views::View:
60 virtual void ChildVisibilityChanged(views::View* child) OVERRIDE { 60 virtual void ChildVisibilityChanged(views::View* child) override {
61 DCHECK_EQ(search_box_, child); 61 DCHECK_EQ(search_box_, child);
62 host_->NotifySearchBoxVisibilityChanged(); 62 host_->NotifySearchBoxVisibilityChanged();
63 } 63 }
64 64
65 AppListMainView* host_; 65 AppListMainView* host_;
66 SearchBoxView* search_box_; 66 SearchBoxView* search_box_;
67 67
68 DISALLOW_COPY_AND_ASSIGN(SearchBoxContainerView); 68 DISALLOW_COPY_AND_ASSIGN(SearchBoxContainerView);
69 }; 69 };
70 70
(...skipping 14 matching lines...) Expand all
85 // Triggers icon loading for given |scale_factor|. 85 // Triggers icon loading for given |scale_factor|.
86 item_->icon().GetRepresentation(scale); 86 item_->icon().GetRepresentation(scale);
87 } 87 }
88 88
89 virtual ~IconLoader() { 89 virtual ~IconLoader() {
90 item_->RemoveObserver(this); 90 item_->RemoveObserver(this);
91 } 91 }
92 92
93 private: 93 private:
94 // AppListItemObserver overrides: 94 // AppListItemObserver overrides:
95 virtual void ItemIconChanged() OVERRIDE { 95 virtual void ItemIconChanged() override {
96 owner_->OnItemIconLoaded(this); 96 owner_->OnItemIconLoaded(this);
97 // Note that IconLoader is released here. 97 // Note that IconLoader is released here.
98 } 98 }
99 99
100 AppListMainView* owner_; 100 AppListMainView* owner_;
101 AppListItem* item_; 101 AppListItem* item_;
102 102
103 DISALLOW_COPY_AND_ASSIGN(IconLoader); 103 DISALLOW_COPY_AND_ASSIGN(IconLoader);
104 }; 104 };
105 105
(...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after
340 // Resubmit the query via a posted task so that all observers for the 340 // Resubmit the query via a posted task so that all observers for the
341 // uninstall notification are notified. 341 // uninstall notification are notified.
342 base::MessageLoop::current()->PostTask( 342 base::MessageLoop::current()->PostTask(
343 FROM_HERE, 343 FROM_HERE,
344 base::Bind(&AppListMainView::QueryChanged, 344 base::Bind(&AppListMainView::QueryChanged,
345 weak_ptr_factory_.GetWeakPtr(), 345 weak_ptr_factory_.GetWeakPtr(),
346 search_box_view_)); 346 search_box_view_));
347 } 347 }
348 348
349 } // namespace app_list 349 } // namespace app_list
OLDNEW
« no previous file with comments | « ui/app_list/views/app_list_main_view.h ('k') | ui/app_list/views/app_list_main_view_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698