chrome/browser/supervised_user/supervised_user_navigation_observer.cc - Issue 584013002: Componentize history_types.{cc,h} and android_history_types.{cc,h}

Side by Side Diff: chrome/browser/supervised_user/supervised_user_navigation_observer.cc

Issue 584013002: Componentize history_types.{cc,h} and android_history_types.{cc,h} (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase Created 6 years, 2 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

« no previous file with comments | « chrome/browser/search/instant_service.h ('k') | chrome/browser/sync/glue/favicon_cache.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 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/supervised_user/supervised_user_navigation_observer.h"	5 #include "chrome/browser/supervised_user/supervised_user_navigation_observer.h"

6	6

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

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

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

10 #include "base/strings/string_util.h"	10 #include "base/strings/string_util.h"

11 #include "chrome/browser/history/history_service.h"	11 #include "chrome/browser/history/history_service.h"

12 #include "chrome/browser/history/history_service_factory.h"	12 #include "chrome/browser/history/history_service_factory.h"

13 #include "chrome/browser/history/history_types.h"

14 #include "chrome/browser/infobars/infobar_service.h"	13 #include "chrome/browser/infobars/infobar_service.h"

15 #include "chrome/browser/profiles/profile.h"	14 #include "chrome/browser/profiles/profile.h"

16 #include "chrome/browser/supervised_user/supervised_user_interstitial.h"	15 #include "chrome/browser/supervised_user/supervised_user_interstitial.h"

17 #include "chrome/browser/supervised_user/supervised_user_resource_throttle.h"	16 #include "chrome/browser/supervised_user/supervised_user_resource_throttle.h"

18 #include "chrome/browser/supervised_user/supervised_user_service.h"	17 #include "chrome/browser/supervised_user/supervised_user_service.h"

19 #include "chrome/browser/supervised_user/supervised_user_service_factory.h"	18 #include "chrome/browser/supervised_user/supervised_user_service_factory.h"

20 #include "chrome/browser/supervised_user/supervised_user_url_filter.h"	19 #include "chrome/browser/supervised_user/supervised_user_url_filter.h"

21 #include "chrome/browser/tab_contents/tab_util.h"	20 #include "chrome/browser/tab_contents/tab_util.h"

22 #include "chrome/grit/generated_resources.h"	21 #include "chrome/grit/generated_resources.h"

	22 #include "components/history/core/browser/history_types.h"

23 #include "components/infobars/core/confirm_infobar_delegate.h"	23 #include "components/infobars/core/confirm_infobar_delegate.h"

24 #include "components/infobars/core/infobar.h"	24 #include "components/infobars/core/infobar.h"

25 #include "content/public/browser/browser_thread.h"	25 #include "content/public/browser/browser_thread.h"

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

27 #include "content/public/browser/render_frame_host.h"	27 #include "content/public/browser/render_frame_host.h"

28 #include "content/public/browser/render_process_host.h"	28 #include "content/public/browser/render_process_host.h"

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

30 #include "ui/base/l10n/l10n_util.h"	30 #include "ui/base/l10n/l10n_util.h"

31	31

32 #if !defined(OS_ANDROID)	32 #if !defined(OS_ANDROID)

(...skipping 210 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
243 history_service->AddPage(add_page_args);	243 history_service->AddPage(add_page_args);

244	244

245 scoped_ptr<NavigationEntry> entry(NavigationEntry::Create());	245 scoped_ptr<NavigationEntry> entry(NavigationEntry::Create());

246 entry->SetVirtualURL(url);	246 entry->SetVirtualURL(url);

247 entry->SetTimestamp(timestamp);	247 entry->SetTimestamp(timestamp);

248 blocked_navigations_.push_back(entry.release());	248 blocked_navigations_.push_back(entry.release());

249 SupervisedUserService* supervised_user_service =	249 SupervisedUserService* supervised_user_service =

250 SupervisedUserServiceFactory::GetForProfile(profile);	250 SupervisedUserServiceFactory::GetForProfile(profile);

251 supervised_user_service->DidBlockNavigation(web_contents());	251 supervised_user_service->DidBlockNavigation(web_contents());

252 }	252 }

OLD	NEW