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

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

Issue 2713993005: Clean up ImageView. (Closed)
Patch Set: revert errant changes Created 3 years, 10 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_item_view.cc ('k') | ui/app_list/views/tile_item_view.cc » ('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/search_result_view.h" 5 #include "ui/app_list/views/search_result_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "ui/app_list/app_list_constants.h" 10 #include "ui/app_list/app_list_constants.h"
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 74
75 SearchResultView::SearchResultView(SearchResultListView* list_view) 75 SearchResultView::SearchResultView(SearchResultListView* list_view)
76 : views::CustomButton(this), 76 : views::CustomButton(this),
77 result_(NULL), 77 result_(NULL),
78 is_last_result_(false), 78 is_last_result_(false),
79 list_view_(list_view), 79 list_view_(list_view),
80 icon_(new views::ImageView), 80 icon_(new views::ImageView),
81 badge_icon_(new views::ImageView), 81 badge_icon_(new views::ImageView),
82 actions_view_(new SearchResultActionsView(this)), 82 actions_view_(new SearchResultActionsView(this)),
83 progress_bar_(new views::ProgressBar) { 83 progress_bar_(new views::ProgressBar) {
84 icon_->set_interactive(false); 84 icon_->set_can_process_events_within_subtree(false);
85 badge_icon_->set_interactive(false); 85 badge_icon_->set_can_process_events_within_subtree(false);
86 86
87 AddChildView(icon_); 87 AddChildView(icon_);
88 AddChildView(badge_icon_); 88 AddChildView(badge_icon_);
89 AddChildView(actions_view_); 89 AddChildView(actions_view_);
90 AddChildView(progress_bar_); 90 AddChildView(progress_bar_);
91 set_context_menu_controller(this); 91 set_context_menu_controller(this);
92 } 92 }
93 93
94 SearchResultView::~SearchResultView() { 94 SearchResultView::~SearchResultView() {
95 ClearResultNoRepaint(); 95 ClearResultNoRepaint();
(...skipping 311 matching lines...) Expand 10 before | Expand all | Expand 10 after
407 return; 407 return;
408 408
409 context_menu_runner_.reset(new views::MenuRunner( 409 context_menu_runner_.reset(new views::MenuRunner(
410 menu_model, views::MenuRunner::HAS_MNEMONICS | views::MenuRunner::ASYNC)); 410 menu_model, views::MenuRunner::HAS_MNEMONICS | views::MenuRunner::ASYNC));
411 context_menu_runner_->RunMenuAt(GetWidget(), NULL, 411 context_menu_runner_->RunMenuAt(GetWidget(), NULL,
412 gfx::Rect(point, gfx::Size()), 412 gfx::Rect(point, gfx::Size()),
413 views::MENU_ANCHOR_TOPLEFT, source_type); 413 views::MENU_ANCHOR_TOPLEFT, source_type);
414 } 414 }
415 415
416 } // namespace app_list 416 } // namespace app_list
OLDNEW
« no previous file with comments | « ui/app_list/views/app_list_item_view.cc ('k') | ui/app_list/views/tile_item_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698