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

Side by Side Diff: chrome/browser/interstitials/security_interstitial_page.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 (c) 2014 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2014 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/interstitials/security_interstitial_page.h" 5 #include "chrome/browser/interstitials/security_interstitial_page.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/i18n/rtl.h" 9 #include "base/i18n/rtl.h"
10 #include "base/metrics/histogram.h" 10 #include "base/metrics/histogram.h"
11 #include "base/prefs/pref_service.h"
12 #include "base/strings/utf_string_conversions.h" 11 #include "base/strings/utf_string_conversions.h"
13 #include "base/values.h" 12 #include "base/values.h"
14 #include "chrome/browser/browser_process.h" 13 #include "chrome/browser/browser_process.h"
15 #include "chrome/browser/interstitials/chrome_controller_client.h" 14 #include "chrome/browser/interstitials/chrome_controller_client.h"
16 #include "chrome/browser/profiles/profile.h" 15 #include "chrome/browser/profiles/profile.h"
17 #include "chrome/common/pref_names.h" 16 #include "chrome/common/pref_names.h"
18 #include "chrome/grit/browser_resources.h" 17 #include "chrome/grit/browser_resources.h"
19 #include "chrome/grit/generated_resources.h" 18 #include "chrome/grit/generated_resources.h"
20 #include "components/grit/components_resources.h" 19 #include "components/grit/components_resources.h"
20 #include "components/prefs/pref_service.h"
21 #include "components/security_interstitials/core/common_string_util.h" 21 #include "components/security_interstitials/core/common_string_util.h"
22 #include "components/security_interstitials/core/metrics_helper.h" 22 #include "components/security_interstitials/core/metrics_helper.h"
23 #include "content/public/browser/interstitial_page.h" 23 #include "content/public/browser/interstitial_page.h"
24 #include "content/public/browser/page_navigator.h" 24 #include "content/public/browser/page_navigator.h"
25 #include "content/public/browser/web_contents.h" 25 #include "content/public/browser/web_contents.h"
26 #include "ui/base/l10n/l10n_util.h" 26 #include "ui/base/l10n/l10n_util.h"
27 #include "ui/base/resource/resource_bundle.h" 27 #include "ui/base/resource/resource_bundle.h"
28 #include "ui/base/webui/jstemplate_builder.h" 28 #include "ui/base/webui/jstemplate_builder.h"
29 #include "ui/base/webui/web_ui_util.h" 29 #include "ui/base/webui/web_ui_util.h"
30 30
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 109
110 security_interstitials::MetricsHelper* 110 security_interstitials::MetricsHelper*
111 SecurityInterstitialPage::metrics_helper() { 111 SecurityInterstitialPage::metrics_helper() {
112 return controller_->metrics_helper(); 112 return controller_->metrics_helper();
113 } 113 }
114 114
115 void SecurityInterstitialPage::set_metrics_helper( 115 void SecurityInterstitialPage::set_metrics_helper(
116 scoped_ptr<security_interstitials::MetricsHelper> metrics_helper) { 116 scoped_ptr<security_interstitials::MetricsHelper> metrics_helper) {
117 controller_->set_metrics_helper(std::move(metrics_helper)); 117 controller_->set_metrics_helper(std::move(metrics_helper));
118 } 118 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698