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

Side by Side Diff: ui/app_list/app_list_item_view.cc

Issue 10827198: Change View::HitTest to View::HitTestRect (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fixed errors reported by trybots Created 8 years, 4 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 | « chrome/browser/ui/views/toolbar_view.cc ('k') | ui/app_list/search_result_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/app_list_item_view.h" 5 #include "ui/app_list/app_list_item_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/message_loop.h" 10 #include "base/message_loop.h"
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 } 61 }
62 62
63 // An image view that is not interactive. 63 // An image view that is not interactive.
64 class StaticImageView : public views::ImageView { 64 class StaticImageView : public views::ImageView {
65 public: 65 public:
66 StaticImageView() : ImageView() { 66 StaticImageView() : ImageView() {
67 } 67 }
68 68
69 private: 69 private:
70 // views::View overrides: 70 // views::View overrides:
71 virtual bool HitTest(const gfx::Point& l) const OVERRIDE { 71 virtual bool HitTestRect(const gfx::Rect& rect) const OVERRIDE {
72 return false; 72 return false;
73 } 73 }
74 74
75 DISALLOW_COPY_AND_ASSIGN(StaticImageView); 75 DISALLOW_COPY_AND_ASSIGN(StaticImageView);
76 }; 76 };
77 77
78 } // namespace 78 } // namespace
79 79
80 // static 80 // static
81 const char AppListItemView::kViewClassName[] = "ui/app_list/AppListItemView"; 81 const char AppListItemView::kViewClassName[] = "ui/app_list/AppListItemView";
(...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after
308 apps_grid_view_->SetSelectedItem(this); 308 apps_grid_view_->SetSelectedItem(this);
309 title_->SetEnabledColor(kTitleHoverColor); 309 title_->SetEnabledColor(kTitleHoverColor);
310 } else { 310 } else {
311 apps_grid_view_->ClearSelectedItem(this); 311 apps_grid_view_->ClearSelectedItem(this);
312 model_->SetHighlighted(false); 312 model_->SetHighlighted(false);
313 title_->SetEnabledColor(kTitleColor); 313 title_->SetEnabledColor(kTitleColor);
314 } 314 }
315 } 315 }
316 316
317 } // namespace app_list 317 } // namespace app_list
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/toolbar_view.cc ('k') | ui/app_list/search_result_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698