chrome/browser/supervised_user/supervised_user_navigation_observer.cc - Issue 469993006: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources.

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

Issue 469993006: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 6 years, 4 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/supervised_user/supervised_user_interstitial.cc ('k') | chrome/browser/supervised_user/supervised_user_service.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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"	13 #include "chrome/browser/history/history_types.h"

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

29 #include "grit/generated_resources.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)

33 #include "chrome/browser/ui/browser.h"	33 #include "chrome/browser/ui/browser.h"

34 #include "chrome/browser/ui/browser_commands.h"	34 #include "chrome/browser/ui/browser_commands.h"

35 #include "chrome/browser/ui/browser_finder.h"	35 #include "chrome/browser/ui/browser_finder.h"

36 #include "chrome/browser/ui/browser_list.h"	36 #include "chrome/browser/ui/browser_list.h"

37 #include "chrome/browser/ui/host_desktop.h"	37 #include "chrome/browser/ui/host_desktop.h"

38 #include "chrome/browser/ui/tabs/tab_strip_model.h"	38 #include "chrome/browser/ui/tabs/tab_strip_model.h"

39 #endif	39 #endif

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

254	254

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

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

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

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

259 SupervisedUserService* supervised_user_service =	259 SupervisedUserService* supervised_user_service =

260 SupervisedUserServiceFactory::GetForProfile(profile);	260 SupervisedUserServiceFactory::GetForProfile(profile);

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

262 }	262 }

OLD	NEW