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

Unified Diff: chrome/browser/ui/toolbar/toolbar_model.cc

Issue 731423002: Remove OriginChip code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix gyp file and bad merge Created 5 years, 10 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
« no previous file with comments | « chrome/browser/ui/toolbar/toolbar_model.h ('k') | chrome/browser/ui/toolbar/toolbar_model_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/toolbar/toolbar_model.cc
diff --git a/chrome/browser/ui/toolbar/toolbar_model.cc b/chrome/browser/ui/toolbar/toolbar_model.cc
index 8dc3acb14f4db2bbf58681948bf407fe47b838ac..1c0a17ba7029d719f48a7cee18d68b63430d1551 100644
--- a/chrome/browser/ui/toolbar/toolbar_model.cc
+++ b/chrome/browser/ui/toolbar/toolbar_model.cc
@@ -8,7 +8,6 @@
ToolbarModel::ToolbarModel()
: input_in_progress_(false),
- origin_chip_enabled_(true),
url_replacement_enabled_(true) {
}
@@ -16,11 +15,6 @@ ToolbarModel::~ToolbarModel() {
}
bool ToolbarModel::WouldReplaceURL() const {
- return WouldOmitURLDueToOriginChip() ||
- WouldPerformSearchTermReplacement(false);
+ return WouldPerformSearchTermReplacement(false);
}
-bool ToolbarModel::ShouldShowOriginChip() const {
- return chrome::ShouldDisplayOriginChip() && WouldOmitURLDueToOriginChip() &&
- origin_chip_enabled();
-}
« no previous file with comments | « chrome/browser/ui/toolbar/toolbar_model.h ('k') | chrome/browser/ui/toolbar/toolbar_model_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698