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

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

Issue 515433002: Cleanup: Remove unneeded ui/ grit header includes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
« no previous file with comments | « chrome/browser/extensions/extension_action.cc ('k') | chrome/browser/themes/theme_service.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"
(...skipping 18 matching lines...) Expand all
29 #include "content/public/browser/cert_store.h" 29 #include "content/public/browser/cert_store.h"
30 #include "content/public/browser/interstitial_page.h" 30 #include "content/public/browser/interstitial_page.h"
31 #include "content/public/browser/navigation_controller.h" 31 #include "content/public/browser/navigation_controller.h"
32 #include "content/public/browser/navigation_entry.h" 32 #include "content/public/browser/navigation_entry.h"
33 #include "content/public/browser/notification_service.h" 33 #include "content/public/browser/notification_service.h"
34 #include "content/public/browser/notification_types.h" 34 #include "content/public/browser/notification_types.h"
35 #include "content/public/browser/render_process_host.h" 35 #include "content/public/browser/render_process_host.h"
36 #include "content/public/browser/render_view_host.h" 36 #include "content/public/browser/render_view_host.h"
37 #include "content/public/browser/web_contents.h" 37 #include "content/public/browser/web_contents.h"
38 #include "content/public/common/ssl_status.h" 38 #include "content/public/common/ssl_status.h"
39 #include "grit/app_locale_settings.h"
40 #include "grit/browser_resources.h" 39 #include "grit/browser_resources.h"
41 #include "net/base/hash_value.h" 40 #include "net/base/hash_value.h"
42 #include "net/base/net_errors.h" 41 #include "net/base/net_errors.h"
43 #include "net/base/net_util.h" 42 #include "net/base/net_util.h"
44 #include "ui/base/l10n/l10n_util.h" 43 #include "ui/base/l10n/l10n_util.h"
45 #include "ui/base/resource/resource_bundle.h" 44 #include "ui/base/resource/resource_bundle.h"
46 #include "ui/base/webui/jstemplate_builder.h" 45 #include "ui/base/webui/jstemplate_builder.h"
47 #include "ui/base/webui/web_ui_util.h" 46 #include "ui/base/webui/web_ui_util.h"
48 47
49 #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION) 48 #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION)
(...skipping 665 matching lines...) Expand 10 before | Expand all | Expand 10 after
715 // sure we don't clear the captive portal flag, since the interstitial was 714 // sure we don't clear the captive portal flag, since the interstitial was
716 // potentially caused by the captive portal. 715 // potentially caused by the captive portal.
717 captive_portal_detected_ = captive_portal_detected_ || 716 captive_portal_detected_ = captive_portal_detected_ ||
718 (results->result == captive_portal::RESULT_BEHIND_CAPTIVE_PORTAL); 717 (results->result == captive_portal::RESULT_BEHIND_CAPTIVE_PORTAL);
719 // Also keep track of non-HTTP portals and error cases. 718 // Also keep track of non-HTTP portals and error cases.
720 captive_portal_no_response_ = captive_portal_no_response_ || 719 captive_portal_no_response_ = captive_portal_no_response_ ||
721 (results->result == captive_portal::RESULT_NO_RESPONSE); 720 (results->result == captive_portal::RESULT_NO_RESPONSE);
722 } 721 }
723 #endif 722 #endif
724 } 723 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_action.cc ('k') | chrome/browser/themes/theme_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698