| Index: chrome/browser/ui/webui/options2/content_settings_handler.h
|
| diff --git a/chrome/browser/ui/webui/options2/content_settings_handler.h b/chrome/browser/ui/webui/options2/content_settings_handler.h
|
| index 977e4ea5e01a175a294c570cf7be1a598cdf99ec..a3164aed67b23a8ea2bdd0bdf242d37222753c6d 100644
|
| --- a/chrome/browser/ui/webui/options2/content_settings_handler.h
|
| +++ b/chrome/browser/ui/webui/options2/content_settings_handler.h
|
| @@ -20,7 +20,7 @@
|
| class HostContentSettingsMap;
|
| class ProtocolHandlerRegistry;
|
|
|
| -namespace options2 {
|
| +namespace options {
|
|
|
| class ContentSettingsHandler : public OptionsPageUIHandler,
|
| public PepperFlashSettingsManager::Client {
|
| @@ -181,6 +181,6 @@ class ContentSettingsHandler : public OptionsPageUIHandler,
|
| DISALLOW_COPY_AND_ASSIGN(ContentSettingsHandler);
|
| };
|
|
|
| -} // namespace options2
|
| +} // namespace options
|
|
|
| #endif // CHROME_BROWSER_UI_WEBUI_OPTIONS2_CONTENT_SETTINGS_HANDLER_H_
|
|
|