Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(42)

Side by Side Diff: chrome/browser/managed_mode/managed_mode_navigation_observer.cc

Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address review comments, merge to LKGR. Created 7 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/managed_mode/managed_mode_navigation_observer.h" 5 #include "chrome/browser/managed_mode/managed_mode_navigation_observer.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/i18n/rtl.h" 8 #include "base/i18n/rtl.h"
9 #include "base/metrics/histogram.h" 9 #include "base/metrics/histogram.h"
10 #include "base/prefs/pref_service.h"
10 #include "base/strings/string_number_conversions.h" 11 #include "base/strings/string_number_conversions.h"
11 #include "chrome/browser/api/infobars/confirm_infobar_delegate.h" 12 #include "chrome/browser/api/infobars/confirm_infobar_delegate.h"
12 #include "chrome/browser/api/infobars/infobar_service.h" 13 #include "chrome/browser/api/infobars/infobar_service.h"
13 #include "chrome/browser/api/infobars/simple_alert_infobar_delegate.h" 14 #include "chrome/browser/api/infobars/simple_alert_infobar_delegate.h"
14 #include "chrome/browser/managed_mode/managed_mode.h" 15 #include "chrome/browser/managed_mode/managed_mode.h"
15 #include "chrome/browser/managed_mode/managed_mode_interstitial.h" 16 #include "chrome/browser/managed_mode/managed_mode_interstitial.h"
16 #include "chrome/browser/managed_mode/managed_mode_resource_throttle.h" 17 #include "chrome/browser/managed_mode/managed_mode_resource_throttle.h"
17 #include "chrome/browser/managed_mode/managed_mode_url_filter.h" 18 #include "chrome/browser/managed_mode/managed_mode_url_filter.h"
18 #include "chrome/browser/managed_mode/managed_user_service.h" 19 #include "chrome/browser/managed_mode/managed_user_service.h"
19 #include "chrome/browser/managed_mode/managed_user_service_factory.h" 20 #include "chrome/browser/managed_mode/managed_user_service_factory.h"
20 #include "chrome/browser/prefs/pref_service.h"
21 #include "chrome/browser/profiles/profile.h" 21 #include "chrome/browser/profiles/profile.h"
22 #include "chrome/browser/ui/browser.h" 22 #include "chrome/browser/ui/browser.h"
23 #include "chrome/browser/ui/browser_commands.h" 23 #include "chrome/browser/ui/browser_commands.h"
24 #include "chrome/browser/ui/browser_finder.h" 24 #include "chrome/browser/ui/browser_finder.h"
25 #include "chrome/browser/ui/browser_list.h" 25 #include "chrome/browser/ui/browser_list.h"
26 #include "chrome/browser/ui/tabs/tab_strip_model.h" 26 #include "chrome/browser/ui/tabs/tab_strip_model.h"
27 #include "chrome/common/pref_names.h" 27 #include "chrome/common/pref_names.h"
28 #include "chrome/common/url_constants.h" 28 #include "chrome/common/url_constants.h"
29 #include "content/public/browser/browser_thread.h" 29 #include "content/public/browser/browser_thread.h"
30 #include "content/public/browser/render_process_host.h" 30 #include "content/public/browser/render_process_host.h"
(...skipping 450 matching lines...) Expand 10 before | Expand all | Expand 10 after
481 case NOT_RECORDING_URLS: 481 case NOT_RECORDING_URLS:
482 // Check that the infobar is present. 482 // Check that the infobar is present.
483 DCHECK(preview_infobar_delegate_); 483 DCHECK(preview_infobar_delegate_);
484 break; 484 break;
485 } 485 }
486 } 486 }
487 487
488 if (behavior == ManagedModeURLFilter::ALLOW) 488 if (behavior == ManagedModeURLFilter::ALLOW)
489 last_allowed_page_ = web_contents()->GetController().GetCurrentEntryIndex(); 489 last_allowed_page_ = web_contents()->GetController().GetCurrentEntryIndex();
490 } 490 }
OLDNEW
« no previous file with comments | « chrome/browser/managed_mode/managed_mode_interstitial.cc ('k') | chrome/browser/managed_mode/managed_user_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698