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

Unified Diff: chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm

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
Index: chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm
diff --git a/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm b/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm
index d08a756a49c74f383743b22209859e8775cd595d..33da31c9750781a51b9ba163e676b2199323bd24 100644
--- a/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm
+++ b/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm
@@ -238,8 +238,7 @@ void OmniboxViewMac::Update() {
}
void OmniboxViewMac::UpdatePlaceholderText() {
- if (chrome::ShouldDisplayOriginChip() ||
- OmniboxFieldTrial::DisplayHintTextWhenPossible()) {
+ if (OmniboxFieldTrial::DisplayHintTextWhenPossible()) {
NSDictionary* placeholder_attributes = @{
NSFontAttributeName : GetFieldFont(gfx::Font::NORMAL),
NSForegroundColorAttributeName : [NSColor disabledControlTextColor]
@@ -836,16 +835,12 @@ bool OmniboxViewMac::OnDoCommandBySelector(SEL cmd) {
void OmniboxViewMac::OnSetFocus(bool control_down) {
model()->OnSetFocus(control_down);
controller()->OnSetFocus();
-
- HandleOriginChipMouseRelease();
}
void OmniboxViewMac::OnKillFocus() {
// Tell the model to reset itself.
model()->OnWillKillFocus();
model()->OnKillFocus();
-
- OnDidKillFocus();
}
void OmniboxViewMac::OnMouseDown(NSInteger button_number) {

Powered by Google App Engine
This is Rietveld 408576698