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

Side by Side Diff: chrome/browser/ssl/ssl_blocking_page.cc

Issue 469993006: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 4 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
« no previous file with comments | « chrome/browser/ssl/ssl_add_certificate.cc ('k') | chrome/browser/ssl/ssl_error_info.cc » ('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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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/ssl/ssl_blocking_page.h" 5 #include "chrome/browser/ssl/ssl_blocking_page.h"
6 6
7 #include "base/build_time.h" 7 #include "base/build_time.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/i18n/rtl.h" 9 #include "base/i18n/rtl.h"
10 #include "base/i18n/time_formatting.h" 10 #include "base/i18n/time_formatting.h"
11 #include "base/metrics/field_trial.h" 11 #include "base/metrics/field_trial.h"
12 #include "base/metrics/histogram.h" 12 #include "base/metrics/histogram.h"
13 #include "base/process/launch.h" 13 #include "base/process/launch.h"
14 #include "base/strings/string_number_conversions.h" 14 #include "base/strings/string_number_conversions.h"
15 #include "base/strings/string_piece.h" 15 #include "base/strings/string_piece.h"
16 #include "base/strings/stringprintf.h" 16 #include "base/strings/stringprintf.h"
17 #include "base/strings/utf_string_conversions.h" 17 #include "base/strings/utf_string_conversions.h"
18 #include "base/time/time.h" 18 #include "base/time/time.h"
19 #include "base/values.h" 19 #include "base/values.h"
20 #include "chrome/browser/chrome_notification_types.h" 20 #include "chrome/browser/chrome_notification_types.h"
21 #include "chrome/browser/history/history_service_factory.h" 21 #include "chrome/browser/history/history_service_factory.h"
22 #include "chrome/browser/profiles/profile.h" 22 #include "chrome/browser/profiles/profile.h"
23 #include "chrome/browser/renderer_preferences_util.h" 23 #include "chrome/browser/renderer_preferences_util.h"
24 #include "chrome/browser/ssl/ssl_error_classification.h" 24 #include "chrome/browser/ssl/ssl_error_classification.h"
25 #include "chrome/browser/ssl/ssl_error_info.h" 25 #include "chrome/browser/ssl/ssl_error_info.h"
26 #include "chrome/common/chrome_switches.h" 26 #include "chrome/common/chrome_switches.h"
27 #include "chrome/grit/chromium_strings.h"
28 #include "chrome/grit/generated_resources.h"
27 #include "content/public/browser/cert_store.h" 29 #include "content/public/browser/cert_store.h"
28 #include "content/public/browser/interstitial_page.h" 30 #include "content/public/browser/interstitial_page.h"
29 #include "content/public/browser/navigation_controller.h" 31 #include "content/public/browser/navigation_controller.h"
30 #include "content/public/browser/navigation_entry.h" 32 #include "content/public/browser/navigation_entry.h"
31 #include "content/public/browser/notification_service.h" 33 #include "content/public/browser/notification_service.h"
32 #include "content/public/browser/notification_types.h" 34 #include "content/public/browser/notification_types.h"
33 #include "content/public/browser/render_process_host.h" 35 #include "content/public/browser/render_process_host.h"
34 #include "content/public/browser/render_view_host.h" 36 #include "content/public/browser/render_view_host.h"
35 #include "content/public/browser/web_contents.h" 37 #include "content/public/browser/web_contents.h"
36 #include "content/public/common/ssl_status.h" 38 #include "content/public/common/ssl_status.h"
37 #include "grit/app_locale_settings.h" 39 #include "grit/app_locale_settings.h"
38 #include "grit/browser_resources.h" 40 #include "grit/browser_resources.h"
39 #include "grit/chromium_strings.h"
40 #include "grit/generated_resources.h"
41 #include "net/base/hash_value.h" 41 #include "net/base/hash_value.h"
42 #include "net/base/net_errors.h" 42 #include "net/base/net_errors.h"
43 #include "net/base/net_util.h" 43 #include "net/base/net_util.h"
44 #include "ui/base/l10n/l10n_util.h" 44 #include "ui/base/l10n/l10n_util.h"
45 #include "ui/base/resource/resource_bundle.h" 45 #include "ui/base/resource/resource_bundle.h"
46 #include "ui/base/webui/jstemplate_builder.h" 46 #include "ui/base/webui/jstemplate_builder.h"
47 #include "ui/base/webui/web_ui_util.h" 47 #include "ui/base/webui/web_ui_util.h"
48 48
49 #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION) 49 #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION)
50 #include "chrome/browser/captive_portal/captive_portal_service.h" 50 #include "chrome/browser/captive_portal/captive_portal_service.h"
(...skipping 645 matching lines...) Expand 10 before | Expand all | Expand 10 after
696 // sure we don't clear the captive portal flag, since the interstitial was 696 // sure we don't clear the captive portal flag, since the interstitial was
697 // potentially caused by the captive portal. 697 // potentially caused by the captive portal.
698 captive_portal_detected_ = captive_portal_detected_ || 698 captive_portal_detected_ = captive_portal_detected_ ||
699 (results->result == captive_portal::RESULT_BEHIND_CAPTIVE_PORTAL); 699 (results->result == captive_portal::RESULT_BEHIND_CAPTIVE_PORTAL);
700 // Also keep track of non-HTTP portals and error cases. 700 // Also keep track of non-HTTP portals and error cases.
701 captive_portal_no_response_ = captive_portal_no_response_ || 701 captive_portal_no_response_ = captive_portal_no_response_ ||
702 (results->result == captive_portal::RESULT_NO_RESPONSE); 702 (results->result == captive_portal::RESULT_NO_RESPONSE);
703 } 703 }
704 #endif 704 #endif
705 } 705 }
OLDNEW
« no previous file with comments | « chrome/browser/ssl/ssl_add_certificate.cc ('k') | chrome/browser/ssl/ssl_error_info.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698