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

Side by Side Diff: chrome/browser/ui/toolbar/toolbar_model_impl.cc

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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 unified diff | Download patch
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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/toolbar/toolbar_model_impl.h" 5 #include "chrome/browser/ui/toolbar/toolbar_model_impl.h"
6 6
7 #include "base/prefs/pref_service.h"
8 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
9 #include "base/time/time.h" 8 #include "base/time/time.h"
10 #include "build/build_config.h" 9 #include "build/build_config.h"
11 #include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h" 10 #include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h"
12 #include "chrome/browser/profiles/profile.h" 11 #include "chrome/browser/profiles/profile.h"
13 #include "chrome/browser/search/search.h" 12 #include "chrome/browser/search/search.h"
14 #include "chrome/browser/ssl/chrome_security_state_model_client.h" 13 #include "chrome/browser/ssl/chrome_security_state_model_client.h"
15 #include "chrome/browser/ui/toolbar/toolbar_model_delegate.h" 14 #include "chrome/browser/ui/toolbar/toolbar_model_delegate.h"
16 #include "chrome/common/pref_names.h" 15 #include "chrome/common/pref_names.h"
17 #include "chrome/common/url_constants.h" 16 #include "chrome/common/url_constants.h"
18 #include "chrome/grit/generated_resources.h" 17 #include "chrome/grit/generated_resources.h"
19 #include "components/google/core/browser/google_util.h" 18 #include "components/google/core/browser/google_util.h"
20 #include "components/omnibox/browser/autocomplete_classifier.h" 19 #include "components/omnibox/browser/autocomplete_classifier.h"
21 #include "components/omnibox/browser/autocomplete_input.h" 20 #include "components/omnibox/browser/autocomplete_input.h"
22 #include "components/omnibox/browser/autocomplete_match.h" 21 #include "components/omnibox/browser/autocomplete_match.h"
22 #include "components/prefs/pref_service.h"
23 #include "components/security_state/security_state_model.h" 23 #include "components/security_state/security_state_model.h"
24 #include "components/url_formatter/elide_url.h" 24 #include "components/url_formatter/elide_url.h"
25 #include "components/url_formatter/url_formatter.h" 25 #include "components/url_formatter/url_formatter.h"
26 #include "content/public/browser/cert_store.h" 26 #include "content/public/browser/cert_store.h"
27 #include "content/public/browser/navigation_controller.h" 27 #include "content/public/browser/navigation_controller.h"
28 #include "content/public/browser/navigation_entry.h" 28 #include "content/public/browser/navigation_entry.h"
29 #include "content/public/browser/web_contents.h" 29 #include "content/public/browser/web_contents.h"
30 #include "content/public/browser/web_ui.h" 30 #include "content/public/browser/web_ui.h"
31 #include "content/public/common/content_constants.h" 31 #include "content/public/common/content_constants.h"
32 #include "content/public/common/ssl_status.h" 32 #include "content/public/common/ssl_status.h"
(...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after
277 277
278 // Otherwise, extract search terms for HTTPS pages that do not have a security 278 // Otherwise, extract search terms for HTTPS pages that do not have a security
279 // error. 279 // error.
280 SecurityStateModel::SecurityLevel security_level = 280 SecurityStateModel::SecurityLevel security_level =
281 GetSecurityLevel(ignore_editing); 281 GetSecurityLevel(ignore_editing);
282 return ((security_level == SecurityStateModel::NONE) || 282 return ((security_level == SecurityStateModel::NONE) ||
283 (security_level == SecurityStateModel::SECURITY_ERROR)) 283 (security_level == SecurityStateModel::SECURITY_ERROR))
284 ? base::string16() 284 ? base::string16()
285 : search_terms; 285 : search_terms;
286 } 286 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698