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

Side by Side Diff: chrome/browser/ui/views/omnibox/omnibox_result_view.cc

Issue 247193002: Remove touch layout (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 int center_; 127 int center_;
128 int right_; 128 int right_;
129 129
130 DISALLOW_COPY_AND_ASSIGN(MirroringContext); 130 DISALLOW_COPY_AND_ASSIGN(MirroringContext);
131 }; 131 };
132 132
133 OmniboxResultView::OmniboxResultView(OmniboxPopupContentsView* model, 133 OmniboxResultView::OmniboxResultView(OmniboxPopupContentsView* model,
134 int model_index, 134 int model_index,
135 LocationBarView* location_bar_view, 135 LocationBarView* location_bar_view,
136 const gfx::FontList& font_list) 136 const gfx::FontList& font_list)
137 : edge_item_padding_(LocationBarView::GetItemPadding()), 137 : edge_item_padding_(LocationBarView::kItemPadding),
138 item_padding_(LocationBarView::GetItemPadding()), 138 item_padding_(LocationBarView::kItemPadding),
139 minimum_text_vertical_padding_(kMinimumTextVerticalPadding), 139 minimum_text_vertical_padding_(kMinimumTextVerticalPadding),
140 model_(model), 140 model_(model),
141 model_index_(model_index), 141 model_index_(model_index),
142 location_bar_view_(location_bar_view), 142 location_bar_view_(location_bar_view),
143 font_list_(font_list), 143 font_list_(font_list),
144 font_height_( 144 font_height_(
145 std::max(font_list.GetHeight(), 145 std::max(font_list.GetHeight(),
146 font_list.DeriveWithStyle(gfx::Font::BOLD).GetHeight())), 146 font_list.DeriveWithStyle(gfx::Font::BOLD).GetHeight())),
147 mirroring_context_(new MirroringContext()), 147 mirroring_context_(new MirroringContext()),
148 keyword_icon_(new views::ImageView()), 148 keyword_icon_(new views::ImageView()),
(...skipping 414 matching lines...) Expand 10 before | Expand all | Expand 10 after
563 } 563 }
564 PaintMatch(*keyword_match, keyword_contents_rendertext_.get(), 564 PaintMatch(*keyword_match, keyword_contents_rendertext_.get(),
565 keyword_description_rendertext_.get(), canvas, x); 565 keyword_description_rendertext_.get(), canvas, x);
566 } 566 }
567 } 567 }
568 568
569 void OmniboxResultView::AnimationProgressed(const gfx::Animation* animation) { 569 void OmniboxResultView::AnimationProgressed(const gfx::Animation* animation) {
570 Layout(); 570 Layout();
571 SchedulePaint(); 571 SchedulePaint();
572 } 572 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698