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

Side by Side Diff: chrome/browser/content_settings/content_settings_policy_provider.cc

Issue 6594063: Update a bunch of files to the new location of browser_thread.h (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 9 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/content_settings/content_settings_policy_provider.h" 5 #include "chrome/browser/content_settings/content_settings_policy_provider.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
11 #include "chrome/browser/browser_thread.h"
12 #include "chrome/browser/content_settings/content_settings_details.h" 11 #include "chrome/browser/content_settings/content_settings_details.h"
13 #include "chrome/browser/content_settings/content_settings_pattern.h" 12 #include "chrome/browser/content_settings/content_settings_pattern.h"
14 #include "chrome/browser/prefs/pref_service.h" 13 #include "chrome/browser/prefs/pref_service.h"
15 #include "chrome/browser/prefs/scoped_pref_update.h" 14 #include "chrome/browser/prefs/scoped_pref_update.h"
16 #include "chrome/browser/profiles/profile.h" 15 #include "chrome/browser/profiles/profile.h"
17 #include "chrome/common/notification_details.h" 16 #include "chrome/common/notification_details.h"
18 #include "chrome/common/notification_service.h" 17 #include "chrome/common/notification_service.h"
19 #include "chrome/common/notification_source.h" 18 #include "chrome/common/notification_source.h"
20 #include "chrome/common/pref_names.h" 19 #include "chrome/common/pref_names.h"
21 20 #include "content/browser/browser_thread.h"
22 #include "webkit/plugins/npapi/plugin_group.h" 21 #include "webkit/plugins/npapi/plugin_group.h"
23 #include "webkit/plugins/npapi/plugin_list.h" 22 #include "webkit/plugins/npapi/plugin_list.h"
24 23
25 namespace { 24 namespace {
26 25
27 // Base pref path of the prefs that contain the managed default content 26 // Base pref path of the prefs that contain the managed default content
28 // settings values. 27 // settings values.
29 const std::string kManagedSettings = 28 const std::string kManagedSettings =
30 "profile.managed_default_content_settings"; 29 "profile.managed_default_content_settings";
31 30
(...skipping 442 matching lines...) Expand 10 before | Expand all | Expand 10 after
474 } 473 }
475 } else if (type == NotificationType::PROFILE_DESTROYED) { 474 } else if (type == NotificationType::PROFILE_DESTROYED) {
476 DCHECK_EQ(profile_, Source<Profile>(source).ptr()); 475 DCHECK_EQ(profile_, Source<Profile>(source).ptr());
477 UnregisterObservers(); 476 UnregisterObservers();
478 } else { 477 } else {
479 NOTREACHED() << "Unexpected notification"; 478 NOTREACHED() << "Unexpected notification";
480 } 479 }
481 } 480 }
482 481
483 } // namespace content_settings 482 } // namespace content_settings
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/webui/system_info_ui.cc ('k') | chrome/browser/content_settings/content_settings_pref_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698