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

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

Issue 2609843004: Fix the Crash in the launcher's start page (a better approach). (Closed)
Patch Set: Rebase. Created 3 years, 11 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) 2014 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 "ui/app_list/views/search_result_container_view.h" 5 #include "ui/app_list/views/search_result_container_view.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/location.h" 8 #include "base/location.h"
9 #include "base/single_thread_task_runner.h" 9 #include "base/single_thread_task_runner.h"
10 #include "base/threading/thread_task_runner_handle.h" 10 #include "base/threading/thread_task_runner_handle.h"
(...skipping 15 matching lines...) Expand all
26 26
27 void SearchResultContainerView::SetResults( 27 void SearchResultContainerView::SetResults(
28 AppListModel::SearchResults* results) { 28 AppListModel::SearchResults* results) {
29 if (results_) 29 if (results_)
30 results_->RemoveObserver(this); 30 results_->RemoveObserver(this);
31 31
32 results_ = results; 32 results_ = results;
33 if (results_) 33 if (results_)
34 results_->AddObserver(this); 34 results_->AddObserver(this);
35 35
36 DoUpdate(); 36 Update();
37 } 37 }
38 38
39 void SearchResultContainerView::SetSelectedIndex(int selected_index) { 39 void SearchResultContainerView::SetSelectedIndex(int selected_index) {
40 DCHECK(IsValidSelectionIndex(selected_index)); 40 DCHECK(IsValidSelectionIndex(selected_index));
41 int old_selected = selected_index_; 41 int old_selected = selected_index_;
42 selected_index_ = selected_index; 42 selected_index_ = selected_index;
43 UpdateSelectedIndex(old_selected, selected_index_); 43 UpdateSelectedIndex(old_selected, selected_index_);
44 } 44 }
45 45
46 void SearchResultContainerView::ClearSelectedIndex() { 46 void SearchResultContainerView::ClearSelectedIndex() {
47 int old_selected = selected_index_; 47 int old_selected = selected_index_;
48 selected_index_ = -1; 48 selected_index_ = -1;
49 UpdateSelectedIndex(old_selected, selected_index_); 49 UpdateSelectedIndex(old_selected, selected_index_);
50 } 50 }
51 51
52 bool SearchResultContainerView::IsValidSelectionIndex(int index) const { 52 bool SearchResultContainerView::IsValidSelectionIndex(int index) const {
53 return index >= 0 && index <= num_results() - 1; 53 return index >= 0 && index <= num_results() - 1;
54 } 54 }
55 55
56 void SearchResultContainerView::ScheduleUpdate() { 56 void SearchResultContainerView::Update() {
57 // When search results are added one by one, each addition generates an update 57 update_factory_.InvalidateWeakPtrs();
58 // request. Consolidates those update requests into one Update call. 58 num_results_ = DoUpdate();
59 if (!update_factory_.HasWeakPtrs()) { 59 Layout();
60 base::ThreadTaskRunnerHandle::Get()->PostTask( 60 if (delegate_)
61 FROM_HERE, base::Bind(&SearchResultContainerView::DoUpdate, 61 delegate_->OnSearchResultContainerResultsChanged();
62 update_factory_.GetWeakPtr()));
63 }
64 } 62 }
65 63
66 bool SearchResultContainerView::UpdateScheduled() { 64 bool SearchResultContainerView::UpdateScheduled() {
67 return update_factory_.HasWeakPtrs(); 65 return update_factory_.HasWeakPtrs();
68 } 66 }
69 67
70 void SearchResultContainerView::ListItemsAdded(size_t start, size_t count) { 68 void SearchResultContainerView::ListItemsAdded(size_t start, size_t count) {
71 ScheduleUpdate(); 69 ScheduleUpdate();
72 } 70 }
73 71
74 void SearchResultContainerView::ListItemsRemoved(size_t start, size_t count) { 72 void SearchResultContainerView::ListItemsRemoved(size_t start, size_t count) {
75 ScheduleUpdate(); 73 ScheduleUpdate();
76 } 74 }
77 75
78 void SearchResultContainerView::ListItemMoved(size_t index, 76 void SearchResultContainerView::ListItemMoved(size_t index,
79 size_t target_index) { 77 size_t target_index) {
80 ScheduleUpdate(); 78 ScheduleUpdate();
81 } 79 }
82 80
83 void SearchResultContainerView::ListItemsChanged(size_t start, size_t count) { 81 void SearchResultContainerView::ListItemsChanged(size_t start, size_t count) {
84 ScheduleUpdate(); 82 ScheduleUpdate();
85 } 83 }
86 84
87 void SearchResultContainerView::DoUpdate() { 85 void SearchResultContainerView::ScheduleUpdate() {
88 update_factory_.InvalidateWeakPtrs(); 86 // When search results are added one by one, each addition generates an update
89 num_results_ = Update(); 87 // request. Consolidates those update requests into one Update call.
90 Layout(); 88 if (!update_factory_.HasWeakPtrs()) {
91 if (delegate_) 89 base::ThreadTaskRunnerHandle::Get()->PostTask(
92 delegate_->OnSearchResultContainerResultsChanged(); 90 FROM_HERE, base::Bind(&SearchResultContainerView::Update,
91 update_factory_.GetWeakPtr()));
92 }
93 } 93 }
94 94
95 } // namespace app_list 95 } // namespace app_list
OLDNEW
« no previous file with comments | « ui/app_list/views/search_result_container_view.h ('k') | ui/app_list/views/search_result_list_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698