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

Side by Side Diff: ios/chrome/browser/ssl/ios_ssl_blocking_page.mm

Issue 2448153002: Fix include path for components grit generated strings. (Closed)
Patch Set: Created 4 years, 1 month 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 | « ios/chrome/browser/DEPS ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 "ios/chrome/browser/ssl/ios_ssl_blocking_page.h" 5 #include "ios/chrome/browser/ssl/ios_ssl_blocking_page.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/memory/ptr_util.h" 9 #include "base/memory/ptr_util.h"
10 #include "base/metrics/histogram.h" 10 #include "base/metrics/histogram.h"
11 #include "base/strings/string_number_conversions.h" 11 #include "base/strings/string_number_conversions.h"
12 #include "base/strings/utf_string_conversions.h" 12 #include "base/strings/utf_string_conversions.h"
13 #include "components/security_interstitials/core/metrics_helper.h" 13 #include "components/security_interstitials/core/metrics_helper.h"
14 #include "components/security_interstitials/core/ssl_error_ui.h" 14 #include "components/security_interstitials/core/ssl_error_ui.h"
15 #include "grit/components_strings.h" 15 #include "components/strings/grit/components_strings.h"
16 #include "ios/chrome/browser/browser_state/chrome_browser_state.h" 16 #include "ios/chrome/browser/browser_state/chrome_browser_state.h"
17 #include "ios/chrome/browser/interstitials/ios_chrome_controller_client.h" 17 #include "ios/chrome/browser/interstitials/ios_chrome_controller_client.h"
18 #include "ios/chrome/browser/interstitials/ios_chrome_metrics_helper.h" 18 #include "ios/chrome/browser/interstitials/ios_chrome_metrics_helper.h"
19 #include "ios/chrome/grit/ios_strings.h" 19 #include "ios/chrome/grit/ios_strings.h"
20 #include "ios/public/provider/chrome/browser/browser_constants.h" 20 #include "ios/public/provider/chrome/browser/browser_constants.h"
21 #import "ios/web/public/navigation_item.h" 21 #import "ios/web/public/navigation_item.h"
22 #include "ios/web/public/ssl_status.h" 22 #include "ios/web/public/ssl_status.h"
23 #include "ios/web/public/web_state/web_state.h" 23 #include "ios/web/public/web_state/web_state.h"
24 #include "net/base/net_errors.h" 24 #include "net/base/net_errors.h"
25 #include "ui/base/l10n/l10n_util.h" 25 #include "ui/base/l10n/l10n_util.h"
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
214 214
215 callback_.Run(false); 215 callback_.Run(false);
216 callback_.Reset(); 216 callback_.Reset();
217 } 217 }
218 218
219 // static 219 // static
220 bool IOSSSLBlockingPage::IsOverridable(int options_mask) { 220 bool IOSSSLBlockingPage::IsOverridable(int options_mask) {
221 return (options_mask & SSLErrorUI::SOFT_OVERRIDE_ENABLED) && 221 return (options_mask & SSLErrorUI::SOFT_OVERRIDE_ENABLED) &&
222 !(options_mask & SSLErrorUI::STRICT_ENFORCEMENT); 222 !(options_mask & SSLErrorUI::STRICT_ENFORCEMENT);
223 } 223 }
OLDNEW
« no previous file with comments | « ios/chrome/browser/DEPS ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698