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

Side by Side Diff: chrome/browser/ui/views/autocomplete/autocomplete_result_view.cc

Issue 10384068: views: Have a more accurate name for View parent_owned accessors. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 7 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 | Annotate | Revision Log
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 // For WinDDK ATL compatibility, these ATL headers must come first. 5 // For WinDDK ATL compatibility, these ATL headers must come first.
6 #include "build/build_config.h" 6 #include "build/build_config.h"
7 #if defined(OS_WIN) 7 #if defined(OS_WIN)
8 #include <atlbase.h> // NOLINT 8 #include <atlbase.h> // NOLINT
9 #include <atlwin.h> // NOLINT 9 #include <atlwin.h> // NOLINT
10 #endif 10 #endif
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 mirroring_context_(new MirroringContext()), 111 mirroring_context_(new MirroringContext()),
112 keyword_icon_(new views::ImageView()), 112 keyword_icon_(new views::ImageView()),
113 ALLOW_THIS_IN_INITIALIZER_LIST( 113 ALLOW_THIS_IN_INITIALIZER_LIST(
114 animation_(new ui::SlideAnimation(this))) { 114 animation_(new ui::SlideAnimation(this))) {
115 CHECK_GE(model_index, 0); 115 CHECK_GE(model_index, 0);
116 if (default_icon_size_ == 0) { 116 if (default_icon_size_ == 0) {
117 default_icon_size_ = ui::ResourceBundle::GetSharedInstance().GetBitmapNamed( 117 default_icon_size_ = ui::ResourceBundle::GetSharedInstance().GetBitmapNamed(
118 AutocompleteMatch::TypeToIcon(AutocompleteMatch::URL_WHAT_YOU_TYPED))-> 118 AutocompleteMatch::TypeToIcon(AutocompleteMatch::URL_WHAT_YOU_TYPED))->
119 width(); 119 width();
120 } 120 }
121 keyword_icon_->set_parent_owned(false); 121 keyword_icon_->set_owned_by_client();
122 keyword_icon_->EnableCanvasFlippingForRTLUI(true); 122 keyword_icon_->EnableCanvasFlippingForRTLUI(true);
123 keyword_icon_->SetImage(GetKeywordIcon()); 123 keyword_icon_->SetImage(GetKeywordIcon());
124 keyword_icon_->SizeToPreferredSize(); 124 keyword_icon_->SizeToPreferredSize();
125 } 125 }
126 126
127 AutocompleteResultView::~AutocompleteResultView() { 127 AutocompleteResultView::~AutocompleteResultView() {
128 } 128 }
129 129
130 // static 130 // static
131 SkColor AutocompleteResultView::GetColor(ResultViewState state, 131 SkColor AutocompleteResultView::GetColor(ResultViewState state,
(...skipping 468 matching lines...) Expand 10 before | Expand all | Expand 10 after
600 PaintMatch(canvas, *match_.associated_keyword.get(), x); 600 PaintMatch(canvas, *match_.associated_keyword.get(), x);
601 } 601 }
602 } 602 }
603 603
604 void AutocompleteResultView::AnimationProgressed( 604 void AutocompleteResultView::AnimationProgressed(
605 const ui::Animation* animation) { 605 const ui::Animation* animation) {
606 Layout(); 606 Layout();
607 SchedulePaint(); 607 SchedulePaint();
608 } 608 }
609 609
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698