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

Side by Side Diff: ui/app_list/views/app_list_view.cc

Issue 1029943002: views: Make View::Paint non-virtual. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: paint-virtual: . Created 5 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
« no previous file with comments | « ui/app_list/views/app_list_view.h ('k') | ui/views/view.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 (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/app_list/views/app_list_view.h" 5 #include "ui/app_list/views/app_list_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/metrics/histogram.h" 10 #include "base/metrics/histogram.h"
(...skipping 324 matching lines...) Expand 10 before | Expand all | Expand 10 after
335 } 335 }
336 336
337 bool AppListView::ShouldCenterWindow() const { 337 bool AppListView::ShouldCenterWindow() const {
338 return delegate_->ShouldCenterWindow(); 338 return delegate_->ShouldCenterWindow();
339 } 339 }
340 340
341 gfx::Size AppListView::GetPreferredSize() const { 341 gfx::Size AppListView::GetPreferredSize() const {
342 return app_list_main_view_->GetPreferredSize(); 342 return app_list_main_view_->GetPreferredSize();
343 } 343 }
344 344
345 void AppListView::Paint(gfx::Canvas* canvas, const views::CullSet& cull_set) { 345 void AppListView::OnPaint(gfx::Canvas* canvas) {
346 views::BubbleDelegateView::Paint(canvas, cull_set); 346 views::BubbleDelegateView::OnPaint(canvas);
347 if (!next_paint_callback_.is_null()) { 347 if (!next_paint_callback_.is_null()) {
348 next_paint_callback_.Run(); 348 next_paint_callback_.Run();
349 next_paint_callback_.Reset(); 349 next_paint_callback_.Reset();
350 } 350 }
351 } 351 }
352 352
353 void AppListView::OnThemeChanged() { 353 void AppListView::OnThemeChanged() {
354 #if defined(OS_WIN) 354 #if defined(OS_WIN)
355 GetWidget()->Close(); 355 GetWidget()->Close();
356 #endif 356 #endif
(...skipping 442 matching lines...) Expand 10 before | Expand all | Expand 10 after
799 799
800 if (will_appear) { 800 if (will_appear) {
801 speech_view_->SetVisible(true); 801 speech_view_->SetVisible(true);
802 } else { 802 } else {
803 app_list_main_view_->SetVisible(true); 803 app_list_main_view_->SetVisible(true);
804 search_box_view_->search_box()->RequestFocus(); 804 search_box_view_->search_box()->RequestFocus();
805 } 805 }
806 } 806 }
807 807
808 } // namespace app_list 808 } // namespace app_list
OLDNEW
« no previous file with comments | « ui/app_list/views/app_list_view.h ('k') | ui/views/view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698