ios/chrome/browser/interstitials/ios_chrome_controller_client.h - Issue 2603433002: Move SecurityInterstitialPage into component

Side by Side Diff: ios/chrome/browser/interstitials/ios_chrome_controller_client.h

Issue 2603433002: Move SecurityInterstitialPage into component (Closed)

Patch Set: fix ios compilation problem Created 3 years, 11 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:

« no previous file with comments | « components/security_interstitials/core/safe_browsing_error_ui.cc ('k') | ios/chrome/browser/interstitials/ios_chrome_controller_client.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2015 The Chromium Authors. All rights reserved.	1 // Copyright 2015 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 #ifndef IOS_CHROME_BROWSER_INTERSTITIALS_IOS_CHROME_CONTROLLER_CLIENT_H_	5 #ifndef IOS_CHROME_BROWSER_INTERSTITIALS_IOS_CHROME_CONTROLLER_CLIENT_H_

6 #define IOS_CHROME_BROWSER_INTERSTITIALS_IOS_CHROME_CONTROLLER_CLIENT_H_	6 #define IOS_CHROME_BROWSER_INTERSTITIALS_IOS_CHROME_CONTROLLER_CLIENT_H_

7	7

8 #include <string>	8 #include <string>

9	9

10 #include "base/macros.h"	10 #include "base/macros.h"

(...skipping 23 matching lines...) Expand all Loading...
34	34

35 private:	35 private:

36 // security_interstitials::ControllerClient implementation.	36 // security_interstitials::ControllerClient implementation.

37 bool CanLaunchDateAndTimeSettings() override;	37 bool CanLaunchDateAndTimeSettings() override;

38 void LaunchDateAndTimeSettings() override;	38 void LaunchDateAndTimeSettings() override;

39 void GoBack() override;	39 void GoBack() override;

40 void GoBackAfterNavigationCommitted() override;	40 void GoBackAfterNavigationCommitted() override;

41 void Proceed() override;	41 void Proceed() override;

42 void Reload() override;	42 void Reload() override;

43 void OpenUrlInCurrentTab(const GURL& url) override;	43 void OpenUrlInCurrentTab(const GURL& url) override;

44 const std::string& GetApplicationLocale() override;	44 const std::string& GetApplicationLocale() const override;

45 PrefService* GetPrefService() override;	45 PrefService* GetPrefService() const override;
	Eugene But (OOO till 7-30) 2016/12/28 19:02:52 Should \|PrefService\| be also const? What if Contr Should \|PrefService\| be also const? What if ControllerClient owns PrefService* object? Jialiu Lin 2016/12/28 19:40:32 We cannot do "const PrefService* GetPrefService() Show quoted text On 2016/12/28 19:02:52, Eugene But wrote: > Should \|PrefService\| be also const? What if ControllerClient owns PrefService > object? We cannot do "const PrefService* GetPrefService() const" here ... Since, certain user actions on interstitial need to modify PrefService (e.g. check/uncheck extended reporting opt-in checkbox) Eugene But (OOO till 7-30) 2016/12/28 20:01:34 nit: If that's the case then is it fair to make \|G Show quoted text On 2016/12/28 19:40:32, Jialiu Lin wrote: > On 2016/12/28 19:02:52, Eugene But wrote: > > Should \|PrefService\| be also const? What if ControllerClient owns > PrefService > > object? > > We cannot do "const PrefService* GetPrefService() const" here ... Since, certain > user actions on interstitial need to modify PrefService (e.g. check/uncheck > extended reporting opt-in checkbox) nit: If that's the case then is it fair to make \|GetPrefService\| method const? It was not const before, which is reasonable, because returning non-const PrefService* allows changing the state of ControllerClient. Jialiu Lin 2016/12/28 20:13:40 You're right. Changed GetPrefService() back to non Show quoted text On 2016/12/28 20:01:34, Eugene But wrote: > On 2016/12/28 19:40:32, Jialiu Lin wrote: > > On 2016/12/28 19:02:52, Eugene But wrote: > > > Should \|PrefService\| be also const? What if ControllerClient owns > > PrefService > > > object? > > > > We cannot do "const PrefService* GetPrefService() const" here ... Since, > certain > > user actions on interstitial need to modify PrefService (e.g. check/uncheck > > extended reporting opt-in checkbox) > nit: If that's the case then is it fair to make \|GetPrefService\| method const? > It was not const before, which is reasonable, because returning non-const > PrefService* allows changing the state of ControllerClient. You're right. Changed GetPrefService() back to non-const method.
46 const std::string GetExtendedReportingPrefName() override;	46 const std::string GetExtendedReportingPrefName() const override;

47	47

48 web::WebState* web_state_;	48 web::WebState* web_state_;

49 web::WebInterstitial* web_interstitial_;	49 web::WebInterstitial* web_interstitial_;

50	50

51 DISALLOW_COPY_AND_ASSIGN(IOSChromeControllerClient);	51 DISALLOW_COPY_AND_ASSIGN(IOSChromeControllerClient);

52 };	52 };

53	53

54 #endif // IOS_CHROME_BROWSER_INTERSTITIALS_IOS_CHROME_CONTROLLER_CLIENT_H_	54 #endif // IOS_CHROME_BROWSER_INTERSTITIALS_IOS_CHROME_CONTROLLER_CLIENT_H_

OLD	NEW