chrome/browser/safe_browsing/client_side_detection_host.cc - Issue 8983010: Convert WebContents to return a content::NavigationController instead of the implementation. Upda...

Side by Side Diff: chrome/browser/safe_browsing/client_side_detection_host.cc

Issue 8983010: Convert WebContents to return a content::NavigationController instead of the implementation. Upda... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: fix mac Created 8 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:

View unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « chrome/browser/safe_browsing/browser_feature_extractor.cc ('k') | chrome/browser/safe_browsing/malware_details.cc » ('j') | content/browser/tab_contents/navigation_controller.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 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/safe_browsing/client_side_detection_host.h"	5 #include "chrome/browser/safe_browsing/client_side_detection_host.h"

6	6

7 #include <vector>	7 #include <vector>

8	8

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

10 #include "base/memory/ref_counted.h"	10 #include "base/memory/ref_counted.h"

11 #include "base/memory/scoped_ptr.h"	11 #include "base/memory/scoped_ptr.h"

12 #include "base/message_loop_helpers.h"	12 #include "base/message_loop_helpers.h"

13 #include "base/metrics/histogram.h"	13 #include "base/metrics/histogram.h"

14 #include "chrome/browser/browser_process.h"	14 #include "chrome/browser/browser_process.h"

15 #include "chrome/browser/prefs/pref_service.h"	15 #include "chrome/browser/prefs/pref_service.h"

16 #include "chrome/browser/profiles/profile.h"	16 #include "chrome/browser/profiles/profile.h"

17 #include "chrome/browser/safe_browsing/browser_feature_extractor.h"	17 #include "chrome/browser/safe_browsing/browser_feature_extractor.h"

18 #include "chrome/browser/safe_browsing/client_side_detection_service.h"	18 #include "chrome/browser/safe_browsing/client_side_detection_service.h"

19 #include "chrome/browser/safe_browsing/safe_browsing_service.h"	19 #include "chrome/browser/safe_browsing/safe_browsing_service.h"

20 #include "chrome/common/chrome_switches.h"	20 #include "chrome/common/chrome_switches.h"

21 #include "chrome/common/pref_names.h"	21 #include "chrome/common/pref_names.h"

22 #include "chrome/common/safe_browsing/csd.pb.h"	22 #include "chrome/common/safe_browsing/csd.pb.h"

23 #include "chrome/common/safe_browsing/safebrowsing_messages.h"	23 #include "chrome/common/safe_browsing/safebrowsing_messages.h"

24 #include "content/browser/renderer_host/render_view_host.h"	24 #include "content/browser/renderer_host/render_view_host.h"

25 #include "content/browser/renderer_host/render_view_host_delegate.h"	25 #include "content/browser/renderer_host/render_view_host_delegate.h"

26 #include "content/browser/renderer_host/resource_dispatcher_host.h"	26 #include "content/browser/renderer_host/resource_dispatcher_host.h"

27 #include "content/browser/renderer_host/resource_request_details.h"	27 #include "content/browser/renderer_host/resource_request_details.h"

28 #include "content/browser/tab_contents/navigation_controller.h"

29 #include "content/public/browser/browser_thread.h"	28 #include "content/public/browser/browser_thread.h"

	29 #include "content/public/browser/navigation_controller.h"

30 #include "content/public/browser/navigation_details.h"	30 #include "content/public/browser/navigation_details.h"

31 #include "content/public/browser/navigation_entry.h"	31 #include "content/public/browser/navigation_entry.h"

32 #include "content/public/browser/notification_details.h"	32 #include "content/public/browser/notification_details.h"

33 #include "content/public/browser/notification_source.h"	33 #include "content/public/browser/notification_source.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/web_contents.h"	36 #include "content/public/browser/web_contents.h"

37 #include "content/public/common/frame_navigate_params.h"	37 #include "content/public/common/frame_navigate_params.h"

38 #include "googleurl/src/gurl.h"	38 #include "googleurl/src/gurl.h"

39	39

(...skipping 452 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
492 if (sb_service_) {	492 if (sb_service_) {

493 sb_service_->RemoveObserver(this);	493 sb_service_->RemoveObserver(this);

494 }	494 }

495 sb_service_ = service;	495 sb_service_ = service;

496 if (sb_service_) {	496 if (sb_service_) {

497 sb_service_->AddObserver(this);	497 sb_service_->AddObserver(this);

498 }	498 }

499 }	499 }

500	500

501 } // namespace safe_browsing	501 } // namespace safe_browsing

OLD	NEW