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

Side by Side Diff: chrome/browser/dom_ui/options/content_settings_handler.cc

Issue 5606002: Move:... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years 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/dom_ui/options/content_settings_handler.h" 5 #include "chrome/browser/dom_ui/options/content_settings_handler.h"
6 6
7 #include "app/l10n_util.h" 7 #include "app/l10n_util.h"
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
11 #include "base/values.h" 11 #include "base/values.h"
12 #include "chrome/browser/browser_list.h" 12 #include "chrome/browser/browser_list.h"
13 #include "chrome/browser/content_settings/content_settings_details.h" 13 #include "chrome/browser/content_settings/content_settings_details.h"
14 #include "chrome/browser/content_settings/host_content_settings_map.h" 14 #include "chrome/browser/content_settings/host_content_settings_map.h"
15 #include "chrome/browser/geolocation/geolocation_content_settings_map.h" 15 #include "chrome/browser/geolocation/geolocation_content_settings_map.h"
16 #include "chrome/browser/notifications/desktop_notification_service.h" 16 #include "chrome/browser/notifications/desktop_notification_service.h"
17 #include "chrome/browser/profile.h" 17 #include "chrome/browser/profiles/profile.h"
18 #include "chrome/common/chrome_switches.h" 18 #include "chrome/common/chrome_switches.h"
19 #include "chrome/common/content_settings_helper.h" 19 #include "chrome/common/content_settings_helper.h"
20 #include "chrome/common/notification_service.h" 20 #include "chrome/common/notification_service.h"
21 #include "chrome/common/notification_source.h" 21 #include "chrome/common/notification_source.h"
22 #include "chrome/common/notification_type.h" 22 #include "chrome/common/notification_type.h"
23 #include "chrome/common/pref_names.h" 23 #include "chrome/common/pref_names.h"
24 #include "chrome/common/url_constants.h" 24 #include "chrome/common/url_constants.h"
25 #include "grit/generated_resources.h" 25 #include "grit/generated_resources.h"
26 #include "grit/locale_settings.h" 26 #include "grit/locale_settings.h"
27 27
(...skipping 702 matching lines...) Expand 10 before | Expand all | Expand 10 after
730 return dom_ui_->GetProfile()->GetHostContentSettingsMap(); 730 return dom_ui_->GetProfile()->GetHostContentSettingsMap();
731 } 731 }
732 732
733 HostContentSettingsMap* 733 HostContentSettingsMap*
734 ContentSettingsHandler::GetOTRContentSettingsMap() { 734 ContentSettingsHandler::GetOTRContentSettingsMap() {
735 Profile* profile = dom_ui_->GetProfile(); 735 Profile* profile = dom_ui_->GetProfile();
736 if (profile->HasOffTheRecordProfile()) 736 if (profile->HasOffTheRecordProfile())
737 return profile->GetOffTheRecordProfile()->GetHostContentSettingsMap(); 737 return profile->GetOffTheRecordProfile()->GetHostContentSettingsMap();
738 return NULL; 738 return NULL;
739 } 739 }
OLDNEW
« no previous file with comments | « chrome/browser/dom_ui/options/clear_browser_data_handler.cc ('k') | chrome/browser/dom_ui/options/cookies_view_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698