Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(152)

Side by Side Diff: chrome/browser/ui/webui/options2/content_settings_handler2.cc

Issue 10584042: Bring up a content settings icon for ungestured registerProtocolHandler call. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to head. Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/ui/webui/options2/content_settings_handler2.h" 5 #include "chrome/browser/ui/webui/options2/content_settings_handler2.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
(...skipping 320 matching lines...) Expand 10 before | Expand all | Expand 10 after
331 {CONTENT_SETTINGS_TYPE_JAVASCRIPT, "javascript"}, 331 {CONTENT_SETTINGS_TYPE_JAVASCRIPT, "javascript"},
332 {CONTENT_SETTINGS_TYPE_PLUGINS, "plugins"}, 332 {CONTENT_SETTINGS_TYPE_PLUGINS, "plugins"},
333 {CONTENT_SETTINGS_TYPE_POPUPS, "popups"}, 333 {CONTENT_SETTINGS_TYPE_POPUPS, "popups"},
334 {CONTENT_SETTINGS_TYPE_GEOLOCATION, "location"}, 334 {CONTENT_SETTINGS_TYPE_GEOLOCATION, "location"},
335 {CONTENT_SETTINGS_TYPE_NOTIFICATIONS, "notifications"}, 335 {CONTENT_SETTINGS_TYPE_NOTIFICATIONS, "notifications"},
336 {CONTENT_SETTINGS_TYPE_INTENTS, "intents"}, 336 {CONTENT_SETTINGS_TYPE_INTENTS, "intents"},
337 {CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE, "auto-select-certificate"}, 337 {CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE, "auto-select-certificate"},
338 {CONTENT_SETTINGS_TYPE_FULLSCREEN, "fullscreen"}, 338 {CONTENT_SETTINGS_TYPE_FULLSCREEN, "fullscreen"},
339 {CONTENT_SETTINGS_TYPE_MOUSELOCK, "mouselock"}, 339 {CONTENT_SETTINGS_TYPE_MOUSELOCK, "mouselock"},
340 {CONTENT_SETTINGS_TYPE_MIXEDSCRIPT, "mixed-script"}, 340 {CONTENT_SETTINGS_TYPE_MIXEDSCRIPT, "mixed-script"},
341 {CONTENT_SETTINGS_TYPE_REGISTER_PROTOCOL_HANDLER,
342 "register-protocol-handler"},
341 {EX_CONTENT_SETTINGS_TYPE_PEPPER_FLASH_CAMERAMIC, "pepper-flash-cameramic"}, 343 {EX_CONTENT_SETTINGS_TYPE_PEPPER_FLASH_CAMERAMIC, "pepper-flash-cameramic"},
342 }; 344 };
343 345
344 ContentSettingsHandler::ContentSettingsHandler() { 346 ContentSettingsHandler::ContentSettingsHandler() {
345 } 347 }
346 348
347 ContentSettingsHandler::~ContentSettingsHandler() { 349 ContentSettingsHandler::~ContentSettingsHandler() {
348 } 350 }
349 351
350 void ContentSettingsHandler::GetLocalizedValues( 352 void ContentSettingsHandler::GetLocalizedValues(
(...skipping 919 matching lines...) Expand 10 before | Expand all | Expand 10 after
1270 for (size_t i = 0; i < arraysize(kExContentSettingsTypeGroupNames); ++i) { 1272 for (size_t i = 0; i < arraysize(kExContentSettingsTypeGroupNames); ++i) {
1271 if (type == kExContentSettingsTypeGroupNames[i].type) 1273 if (type == kExContentSettingsTypeGroupNames[i].type)
1272 return kExContentSettingsTypeGroupNames[i].name; 1274 return kExContentSettingsTypeGroupNames[i].name;
1273 } 1275 }
1274 1276
1275 NOTREACHED(); 1277 NOTREACHED();
1276 return std::string(); 1278 return std::string();
1277 } 1279 }
1278 1280
1279 } // namespace options2 1281 } // namespace options2
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698