diff options
| author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-29 19:49:45 +0000 |
|---|---|---|
| committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-29 19:49:45 +0000 |
| commit | e284e6d8f6079a7cfc8eb70f010cf2378253fb18 (patch) | |
| tree | 9cd71a6abb4d08b700e477f7e779cc978a39717d /chrome/browser/views/options | |
| parent | eb6b623883f7956e10bdf1f1749257f91b2d75a7 (diff) | |
| download | chromium_src-e284e6d8f6079a7cfc8eb70f010cf2378253fb18.zip chromium_src-e284e6d8f6079a7cfc8eb70f010cf2378253fb18.tar.gz chromium_src-e284e6d8f6079a7cfc8eb70f010cf2378253fb18.tar.bz2 | |
Reland r37508. Implement HostContentSettingsMap.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/555172
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37526 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/options')
| -rw-r--r-- | chrome/browser/views/options/content_settings_window_view.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/views/options/content_settings_window_view.h b/chrome/browser/views/options/content_settings_window_view.h index 7bb5ec1..164e580 100644 --- a/chrome/browser/views/options/content_settings_window_view.h +++ b/chrome/browser/views/options/content_settings_window_view.h @@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_VIEWS_OPTIONS_CONTENT_SETTINGS_WINDOW_VIEW_H_ #define CHROME_BROWSER_VIEWS_OPTIONS_CONTENT_SETTINGS_WINDOW_VIEW_H_ +#include "chrome/common/content_permission_types.h" #include "chrome/common/pref_member.h" -#include "chrome/browser/content_settings_types.h" #include "views/controls/tabbed_pane/tabbed_pane.h" #include "views/view.h" #include "views/window/dialog_delegate.h" |