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

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

Issue 25039002: Always aligns text at vertically center (Textfield, Label). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Synced. Created 7 years, 1 month 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
« no previous file with comments | « chrome/browser/ui/views/omnibox/omnibox_views.h ('k') | ui/gfx/font.h » ('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 "chrome/browser/ui/views/omnibox/omnibox_views.h" 5 #include "chrome/browser/ui/views/omnibox/omnibox_views.h"
6 6
7 #include "chrome/browser/ui/omnibox/omnibox_edit_controller.h" 7 #include "chrome/browser/ui/omnibox/omnibox_edit_controller.h"
8 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" 8 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
9 #include "chrome/browser/ui/views/omnibox/omnibox_view_views.h" 9 #include "chrome/browser/ui/views/omnibox/omnibox_view_views.h"
10 #include "ui/views/controls/textfield/textfield.h" 10 #include "ui/views/controls/textfield/textfield.h"
(...skipping 14 matching lines...) Expand all
25 #else 25 #else
26 return NULL; 26 return NULL;
27 #endif 27 #endif
28 } 28 }
29 29
30 OmniboxView* CreateOmniboxView(OmniboxEditController* controller, 30 OmniboxView* CreateOmniboxView(OmniboxEditController* controller,
31 Profile* profile, 31 Profile* profile,
32 CommandUpdater* command_updater, 32 CommandUpdater* command_updater,
33 bool popup_window_mode, 33 bool popup_window_mode,
34 LocationBarView* location_bar, 34 LocationBarView* location_bar,
35 const gfx::FontList& font_list, 35 const gfx::FontList& font_list) {
36 int font_y_offset) {
37 #if defined(OS_WIN) && !defined(USE_AURA) 36 #if defined(OS_WIN) && !defined(USE_AURA)
38 if (!views::Textfield::IsViewsTextfieldEnabled()) { 37 if (!views::Textfield::IsViewsTextfieldEnabled()) {
39 return new OmniboxViewWin(controller, location_bar, command_updater, 38 return new OmniboxViewWin(controller, location_bar, command_updater,
40 popup_window_mode, font_list, font_y_offset); 39 popup_window_mode, font_list);
41 } 40 }
42 #endif 41 #endif
43 OmniboxViewViews* omnibox = new OmniboxViewViews( 42 OmniboxViewViews* omnibox = new OmniboxViewViews(
44 controller, profile, command_updater, popup_window_mode, location_bar, 43 controller, profile, command_updater, popup_window_mode, location_bar,
45 font_list, font_y_offset); 44 font_list);
46 omnibox->Init(); 45 omnibox->Init();
47 return omnibox; 46 return omnibox;
48 } 47 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/omnibox/omnibox_views.h ('k') | ui/gfx/font.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698