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

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

Issue 498773003: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (part 2 … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 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 | Annotate | Revision Log
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/command_line.h" 7 #include "base/command_line.h"
8 #include "base/prefs/pref_service.h" 8 #include "base/prefs/pref_service.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "chrome/browser/autocomplete/autocomplete_classifier.h" 10 #include "chrome/browser/autocomplete/autocomplete_classifier.h"
11 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h" 11 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h"
12 #include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h" 12 #include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h"
13 #include "chrome/browser/profiles/profile.h" 13 #include "chrome/browser/profiles/profile.h"
14 #include "chrome/browser/search/search.h" 14 #include "chrome/browser/search/search.h"
15 #include "chrome/browser/ssl/ssl_error_info.h" 15 #include "chrome/browser/ssl/ssl_error_info.h"
16 #include "chrome/browser/ui/toolbar/toolbar_model_delegate.h" 16 #include "chrome/browser/ui/toolbar/toolbar_model_delegate.h"
17 #include "chrome/common/chrome_constants.h" 17 #include "chrome/common/chrome_constants.h"
18 #include "chrome/common/chrome_switches.h" 18 #include "chrome/common/chrome_switches.h"
19 #include "chrome/common/pref_names.h" 19 #include "chrome/common/pref_names.h"
20 #include "chrome/common/url_constants.h" 20 #include "chrome/common/url_constants.h"
21 #include "chrome/grit/generated_resources.h"
21 #include "components/google/core/browser/google_util.h" 22 #include "components/google/core/browser/google_util.h"
22 #include "components/omnibox/autocomplete_input.h" 23 #include "components/omnibox/autocomplete_input.h"
23 #include "components/omnibox/autocomplete_match.h" 24 #include "components/omnibox/autocomplete_match.h"
24 #include "content/public/browser/cert_store.h" 25 #include "content/public/browser/cert_store.h"
25 #include "content/public/browser/navigation_controller.h" 26 #include "content/public/browser/navigation_controller.h"
26 #include "content/public/browser/navigation_entry.h" 27 #include "content/public/browser/navigation_entry.h"
27 #include "content/public/browser/web_contents.h" 28 #include "content/public/browser/web_contents.h"
28 #include "content/public/browser/web_ui.h" 29 #include "content/public/browser/web_ui.h"
29 #include "content/public/common/content_constants.h" 30 #include "content/public/common/content_constants.h"
30 #include "content/public/common/ssl_status.h" 31 #include "content/public/common/ssl_status.h"
31 #include "grit/component_scaled_resources.h" 32 #include "grit/component_scaled_resources.h"
32 #include "grit/generated_resources.h"
33 #include "grit/theme_resources.h" 33 #include "grit/theme_resources.h"
34 #include "net/base/net_util.h" 34 #include "net/base/net_util.h"
35 #include "net/cert/cert_status_flags.h" 35 #include "net/cert/cert_status_flags.h"
36 #include "net/cert/x509_certificate.h" 36 #include "net/cert/x509_certificate.h"
37 #include "ui/base/l10n/l10n_util.h" 37 #include "ui/base/l10n/l10n_util.h"
38 38
39 #if defined(OS_CHROMEOS) 39 #if defined(OS_CHROMEOS)
40 #include "chrome/browser/chromeos/policy/policy_cert_service.h" 40 #include "chrome/browser/chromeos/policy/policy_cert_service.h"
41 #include "chrome/browser/chromeos/policy/policy_cert_service_factory.h" 41 #include "chrome/browser/chromeos/policy/policy_cert_service_factory.h"
42 #endif 42 #endif
(...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after
329 if (entry && 329 if (entry &&
330 google_util::StartsWithCommandLineGoogleBaseURL(entry->GetVirtualURL())) 330 google_util::StartsWithCommandLineGoogleBaseURL(entry->GetVirtualURL()))
331 return search_terms; 331 return search_terms;
332 332
333 // Otherwise, extract search terms for HTTPS pages that do not have a security 333 // Otherwise, extract search terms for HTTPS pages that do not have a security
334 // error. 334 // error.
335 ToolbarModel::SecurityLevel security_level = GetSecurityLevel(ignore_editing); 335 ToolbarModel::SecurityLevel security_level = GetSecurityLevel(ignore_editing);
336 return ((security_level == NONE) || (security_level == SECURITY_ERROR)) ? 336 return ((security_level == NONE) || (security_level == SECURITY_ERROR)) ?
337 base::string16() : search_terms; 337 base::string16() : search_terms;
338 } 338 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc ('k') | chrome/browser/ui/toolbar/wrench_menu_model.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698