ios/chrome/browser/safe_browsing/ui_manager.cc - Issue 1662843002: Revert of Delete base/prefs and update callers to use components.

Side by Side Diff: ios/chrome/browser/safe_browsing/ui_manager.cc

Issue 1662843002: Revert of Delete base/prefs and update callers to use components. (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

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 #include "ios/chrome/browser/safe_browsing/ui_manager.h"	5 #include "ios/chrome/browser/safe_browsing/ui_manager.h"

6	6

7 #include "base/bind.h"	7 #include "base/bind.h"

8 #include "base/bind_helpers.h"	8 #include "base/bind_helpers.h"

9 #include "base/callback.h"	9 #include "base/callback.h"

10 #include "base/debug/leak_tracker.h"	10 #include "base/debug/leak_tracker.h"

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

12 #include "base/metrics/histogram_macros.h"	12 #include "base/metrics/histogram_macros.h"

	13 #include "base/prefs/pref_service.h"

13 #include "base/stl_util.h"	14 #include "base/stl_util.h"

14 #include "base/strings/string_util.h"	15 #include "base/strings/string_util.h"

15 #include "base/threading/thread.h"	16 #include "base/threading/thread.h"

16 #include "base/threading/thread_restrictions.h"	17 #include "base/threading/thread_restrictions.h"

17 #include "components/prefs/pref_service.h"

18 #include "ios/chrome/browser/pref_names.h"	18 #include "ios/chrome/browser/pref_names.h"

19 #include "ios/chrome/browser/safe_browsing/metadata.pb.h"	19 #include "ios/chrome/browser/safe_browsing/metadata.pb.h"

20 #include "ios/chrome/browser/safe_browsing/ping_manager.h"	20 #include "ios/chrome/browser/safe_browsing/ping_manager.h"

21 #include "ios/chrome/browser/safe_browsing/safe_browsing_blocking_page.h"	21 #include "ios/chrome/browser/safe_browsing/safe_browsing_blocking_page.h"

22 #include "ios/chrome/browser/safe_browsing/safe_browsing_service.h"	22 #include "ios/chrome/browser/safe_browsing/safe_browsing_service.h"

23 #include "ios/public/provider/chrome/browser/browser_state/chrome_browser_state. h"	23 #include "ios/public/provider/chrome/browser/browser_state/chrome_browser_state. h"

24 #include "ios/public/provider/chrome/browser/chrome_browser_provider.h"	24 #include "ios/public/provider/chrome/browser/chrome_browser_provider.h"

25 #include "ios/web/public/navigation_item.h"	25 #include "ios/web/public/navigation_item.h"

26 #include "ios/web/public/navigation_manager.h"	26 #include "ios/web/public/navigation_manager.h"

27 #include "ios/web/public/web_state/web_state.h"	27 #include "ios/web/public/web_state/web_state.h"

(...skipping 299 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
327 GURL maybe_whitelisted_url(	327 GURL maybe_whitelisted_url(

328 resource.is_subresource ? web_state->GetVisibleURL() : resource.url);	328 resource.is_subresource ? web_state->GetVisibleURL() : resource.url);

329 WhitelistUrlSet* site_list =	329 WhitelistUrlSet* site_list =

330 static_cast<WhitelistUrlSet*>(web_state->GetUserData(kWhitelistKey));	330 static_cast<WhitelistUrlSet*>(web_state->GetUserData(kWhitelistKey));

331 if (!site_list)	331 if (!site_list)

332 return false;	332 return false;

333 return site_list->Contains(maybe_whitelisted_url);	333 return site_list->Contains(maybe_whitelisted_url);

334 }	334 }

335	335

336 } // namespace safe_browsing	336 } // namespace safe_browsing

OLD	NEW