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

Side by Side Diff: chrome/browser/ui/views/location_bar/location_bar_view.cc

Issue 2248873002: Convert WindowOpenDisposition to an enum class. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 4 years, 3 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
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/location_bar/location_bar_view.h" 5 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <map> 8 #include <map>
9 9
10 #include "base/i18n/rtl.h" 10 #include "base/i18n/rtl.h"
(...skipping 1074 matching lines...) Expand 10 before | Expand all | Expand 10 after
1085 1085
1086 WindowOpenDisposition LocationBarView::GetWindowOpenDisposition() const { 1086 WindowOpenDisposition LocationBarView::GetWindowOpenDisposition() const {
1087 return disposition(); 1087 return disposition();
1088 } 1088 }
1089 1089
1090 ui::PageTransition LocationBarView::GetPageTransition() const { 1090 ui::PageTransition LocationBarView::GetPageTransition() const {
1091 return transition(); 1091 return transition();
1092 } 1092 }
1093 1093
1094 void LocationBarView::AcceptInput() { 1094 void LocationBarView::AcceptInput() {
1095 omnibox_view_->model()->AcceptInput(CURRENT_TAB, false); 1095 omnibox_view_->model()->AcceptInput(WindowOpenDisposition::CURRENT_TAB,
1096 false);
1096 } 1097 }
1097 1098
1098 void LocationBarView::FocusSearch() { 1099 void LocationBarView::FocusSearch() {
1099 omnibox_view_->SetFocus(); 1100 omnibox_view_->SetFocus();
1100 omnibox_view_->EnterKeywordModeForDefaultSearchProvider(); 1101 omnibox_view_->EnterKeywordModeForDefaultSearchProvider();
1101 } 1102 }
1102 1103
1103 void LocationBarView::UpdateContentSettingsIcons() { 1104 void LocationBarView::UpdateContentSettingsIcons() {
1104 if (RefreshContentSettingViews()) { 1105 if (RefreshContentSettingViews()) {
1105 Layout(); 1106 Layout();
(...skipping 294 matching lines...) Expand 10 before | Expand all | Expand 10 after
1400 // LocationBarView, private TemplateURLServiceObserver implementation: 1401 // LocationBarView, private TemplateURLServiceObserver implementation:
1401 1402
1402 void LocationBarView::OnTemplateURLServiceChanged() { 1403 void LocationBarView::OnTemplateURLServiceChanged() {
1403 template_url_service_->RemoveObserver(this); 1404 template_url_service_->RemoveObserver(this);
1404 template_url_service_ = nullptr; 1405 template_url_service_ = nullptr;
1405 // If the browser is no longer active, let's not show the info bubble, as this 1406 // If the browser is no longer active, let's not show the info bubble, as this
1406 // would make the browser the active window again. 1407 // would make the browser the active window again.
1407 if (omnibox_view_ && omnibox_view_->GetWidget()->IsActive()) 1408 if (omnibox_view_ && omnibox_view_->GetWidget()->IsActive())
1408 ShowFirstRunBubble(); 1409 ShowFirstRunBubble();
1409 } 1410 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698