| OLD | NEW |
|---|
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "base/callback.h" | 7 #include "base/callback.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/utf_string_conversions.h" | 9 #include "base/utf_string_conversions.h" |
| 10 #include "base/values.h" | 10 #include "base/values.h" |
| (...skipping 708 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 719 return web_ui_->GetProfile()->GetHostContentSettingsMap(); | 719 return web_ui_->GetProfile()->GetHostContentSettingsMap(); |
| 720 } | 720 } |
| 721 | 721 |
| 722 HostContentSettingsMap* | 722 HostContentSettingsMap* |
| 723 ContentSettingsHandler::GetOTRContentSettingsMap() { | 723 ContentSettingsHandler::GetOTRContentSettingsMap() { |
| 724 Profile* profile = web_ui_->GetProfile(); | 724 Profile* profile = web_ui_->GetProfile(); |
| 725 if (profile->HasOffTheRecordProfile()) | 725 if (profile->HasOffTheRecordProfile()) |
| 726 return profile->GetOffTheRecordProfile()->GetHostContentSettingsMap(); | 726 return profile->GetOffTheRecordProfile()->GetHostContentSettingsMap(); |
| 727 return NULL; | 727 return NULL; |
| 728 } | 728 } |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 6469067:
WebUI: Move chrome/browser/dom_ui/options/ to chrome/browser/webui/options. (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src