| Index: chrome/browser/ui/webui/options/content_settings_handler.cc
|
| diff --git a/chrome/browser/ui/webui/options/content_settings_handler.cc b/chrome/browser/ui/webui/options/content_settings_handler.cc
|
| index 7eeee986a660f219d7a4b49bc5b6f16efbfdc530..9a0e87309e50e5cddcbb0150fa83845e87f302c2 100644
|
| --- a/chrome/browser/ui/webui/options/content_settings_handler.cc
|
| +++ b/chrome/browser/ui/webui/options/content_settings_handler.cc
|
| @@ -87,15 +87,15 @@ typedef bool (*AppFilter)(const extensions::Extension& app,
|
| const char kExceptionsLearnMoreUrl[] =
|
| "https://support.google.com/chrome/?p=settings_manage_exceptions";
|
|
|
| -const char* kSetting = "setting";
|
| -const char* kOrigin = "origin";
|
| -const char* kSource = "source";
|
| -const char* kAppName = "appName";
|
| -const char* kAppId = "appId";
|
| -const char* kEmbeddingOrigin = "embeddingOrigin";
|
| -const char* kPreferencesSource = "preference";
|
| -const char* kVideoSetting = "video";
|
| -const char* kZoom = "zoom";
|
| +const char kSetting[] = "setting";
|
| +const char kOrigin[] = "origin";
|
| +const char kSource[] = "source";
|
| +const char kAppName[] = "appName";
|
| +const char kAppId[] = "appId";
|
| +const char kEmbeddingOrigin[] = "embeddingOrigin";
|
| +const char kPreferencesSource[] = "preference";
|
| +const char kVideoSetting[] = "video";
|
| +const char kZoom[] = "zoom";
|
|
|
| const ContentSettingsTypeNameEntry kContentSettingsTypeGroupNames[] = {
|
| {CONTENT_SETTINGS_TYPE_COOKIES, "cookies"},
|
| @@ -124,7 +124,7 @@ const ContentSettingsTypeNameEntry kContentSettingsTypeGroupNames[] = {
|
|
|
| // A pseudo content type. We use it to display data like a content setting even
|
| // though it is not a real content setting.
|
| -const char* kZoomContentType = "zoomlevels";
|
| +const char kZoomContentType[] = "zoomlevels";
|
|
|
| content::BrowserContext* GetBrowserContext(content::WebUI* web_ui) {
|
| return web_ui->GetWebContents()->GetBrowserContext();
|
|
|