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

Unified Diff: chrome/browser/ui/views/omnibox/omnibox_view_views.cc

Issue 10854017: Basic metro snap view omnibox. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix chromeos compilation. 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/omnibox/omnibox_view_views.cc
diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_views.cc b/chrome/browser/ui/views/omnibox/omnibox_view_views.cc
index 284dd84ea43b8d1c67d88972247fb164a4022a4a..5ab66e9a5d813c6e86dc88c048e3eb073f1a4859 100644
--- a/chrome/browser/ui/views/omnibox/omnibox_view_views.cc
+++ b/chrome/browser/ui/views/omnibox/omnibox_view_views.cc
@@ -224,11 +224,11 @@ OmniboxViewViews::OmniboxViewViews(OmniboxEditController* controller,
ToolbarModel* toolbar_model,
Profile* profile,
CommandUpdater* command_updater,
- bool popup_window_mode,
+ WindowMode window_mode,
LocationBarView* location_bar)
: OmniboxView(profile, controller, toolbar_model, command_updater),
textfield_(NULL),
- popup_window_mode_(popup_window_mode),
+ window_mode_(window_mode),
security_level_(ToolbarModel::NONE),
ime_composing_before_change_(false),
delete_at_end_pressed_(false),
@@ -264,14 +264,14 @@ void OmniboxViewViews::Init(views::View* popup_parent_view) {
textfield_->SetController(this);
textfield_->SetTextInputType(ui::TEXT_INPUT_TYPE_URL);
- if (popup_window_mode_)
+ if (window_mode_ == POPUP)
textfield_->SetReadOnly(true);
const int font_size =
- !popup_window_mode_ && chrome::search::IsInstantExtendedAPIEnabled(
+ (window_mode_ != POPUP) && chrome::search::IsInstantExtendedAPIEnabled(
location_bar_view_->profile()) ?
chrome::search::kOmniboxFontSize :
- GetEditFontPixelSize(popup_window_mode_);
+ GetEditFontPixelSize(window_mode_ == POPUP);
const int old_size = textfield_->font().GetFontSize();
if (font_size != old_size)
textfield_->SetFont(textfield_->font().DeriveFont(font_size - old_size));
@@ -283,7 +283,7 @@ void OmniboxViewViews::Init(views::View* popup_parent_view) {
popup_parent_view));
// A null-border to zero out the focused border on textfield.
- const int vertical_margin = !popup_window_mode_ ?
+ const int vertical_margin = (window_mode_ != POPUP) ?
kAutocompleteVerticalMargin : kAutocompleteVerticalMarginInPopup;
set_border(views::Border::CreateEmptyBorder(vertical_margin, 0,
vertical_margin, 0));
« no previous file with comments | « chrome/browser/ui/views/omnibox/omnibox_view_views.h ('k') | chrome/browser/ui/views/omnibox/omnibox_view_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698