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

Side by Side Diff: chrome/browser/omnibox_search_hint.cc

Issue 2982009: Revert everything related to the relanding. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: Created 10 years, 5 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
« no previous file with comments | « chrome/browser/net/chrome_net_log.h ('k') | chrome/browser/plugin_process_host.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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/omnibox_search_hint.h" 5 #include "chrome/browser/omnibox_search_hint.h"
6 6
7 #include "app/animation.h" 7 #include "app/animation.h"
8 #include "app/l10n_util.h" 8 #include "app/l10n_util.h"
9 #include "app/resource_bundle.h" 9 #include "app/resource_bundle.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
11 #include "base/histogram.h"
12 #include "base/task.h" 11 #include "base/task.h"
13 #include "chrome/browser/autocomplete/autocomplete_edit.h" 12 #include "chrome/browser/autocomplete/autocomplete_edit.h"
14 #include "chrome/browser/autocomplete/autocomplete_edit_view.h" 13 #include "chrome/browser/autocomplete/autocomplete_edit_view.h"
15 #include "chrome/browser/browser_list.h" 14 #include "chrome/browser/browser_list.h"
16 #include "chrome/browser/browser_window.h" 15 #include "chrome/browser/browser_window.h"
17 #include "chrome/browser/location_bar.h" 16 #include "chrome/browser/location_bar.h"
18 #include "chrome/browser/pref_service.h" 17 #include "chrome/browser/pref_service.h"
19 #include "chrome/browser/profile.h" 18 #include "chrome/browser/profile.h"
20 #include "chrome/browser/search_engines/template_url_model.h" 19 #include "chrome/browser/search_engines/template_url_model.h"
21 #include "chrome/browser/tab_contents/infobar_delegate.h" 20 #include "chrome/browser/tab_contents/infobar_delegate.h"
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 } 198 }
200 199
201 // static 200 // static
202 bool OmniboxSearchHint::IsEnabled(Profile* profile) { 201 bool OmniboxSearchHint::IsEnabled(Profile* profile) {
203 // The infobar can only be shown if the correct switch has been provided and 202 // The infobar can only be shown if the correct switch has been provided and
204 // the user did not dismiss the infobar before. 203 // the user did not dismiss the infobar before.
205 return profile->GetPrefs()->GetBoolean(prefs::kShowOmniboxSearchHint) && 204 return profile->GetPrefs()->GetBoolean(prefs::kShowOmniboxSearchHint) &&
206 CommandLine::ForCurrentProcess()->HasSwitch( 205 CommandLine::ForCurrentProcess()->HasSwitch(
207 switches::kSearchInOmniboxHint); 206 switches::kSearchInOmniboxHint);
208 } 207 }
OLDNEW
« no previous file with comments | « chrome/browser/net/chrome_net_log.h ('k') | chrome/browser/plugin_process_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698