diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-29 18:03:38 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-29 18:03:38 +0000 |
| commit | 437cf0eb7842e8db4a5702b4e18a5b865e58042a (patch) | |
| tree | 1f11c2defdb083f80235ace1e5835c1ba78f7100 /chrome/browser/views/options | |
| parent | 6828a51a1dea514c9bb57826ff9f1c3879287b92 (diff) | |
| download | chromium_src-437cf0eb7842e8db4a5702b4e18a5b865e58042a.zip chromium_src-437cf0eb7842e8db4a5702b4e18a5b865e58042a.tar.gz chromium_src-437cf0eb7842e8db4a5702b4e18a5b865e58042a.tar.bz2 | |
Revert "Implement HostContentSettingsMap"
This reverts commit r37508, as it was crashing on the reliability bots.
Review URL: http://codereview.chromium.org/556076
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37519 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 164e580..7bb5ec1 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" |