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

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: Review comments. Move to radio buttons 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 319 matching lines...) Expand 10 before | Expand all | Expand 10 after
330 {CONTENT_SETTINGS_TYPE_IMAGES, "images"}, 330 {CONTENT_SETTINGS_TYPE_IMAGES, "images"},
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_REGISTER_PROTOCOL_HANDLER,
341 "register-protocol-handler"},
340 {EX_CONTENT_SETTINGS_TYPE_PEPPER_FLASH_CAMERAMIC, "pepper-flash-cameramic"}, 342 {EX_CONTENT_SETTINGS_TYPE_PEPPER_FLASH_CAMERAMIC, "pepper-flash-cameramic"},
341 }; 343 };
342 344
343 ContentSettingsHandler::ContentSettingsHandler() { 345 ContentSettingsHandler::ContentSettingsHandler() {
344 } 346 }
345 347
346 ContentSettingsHandler::~ContentSettingsHandler() { 348 ContentSettingsHandler::~ContentSettingsHandler() {
347 } 349 }
348 350
349 void ContentSettingsHandler::GetLocalizedValues( 351 void ContentSettingsHandler::GetLocalizedValues(
(...skipping 916 matching lines...) Expand 10 before | Expand all | Expand 10 after
1266 for (size_t i = 0; i < arraysize(kExContentSettingsTypeGroupNames); ++i) { 1268 for (size_t i = 0; i < arraysize(kExContentSettingsTypeGroupNames); ++i) {
1267 if (type == kExContentSettingsTypeGroupNames[i].type) 1269 if (type == kExContentSettingsTypeGroupNames[i].type)
1268 return kExContentSettingsTypeGroupNames[i].name; 1270 return kExContentSettingsTypeGroupNames[i].name;
1269 } 1271 }
1270 1272
1271 NOTREACHED(); 1273 NOTREACHED();
1272 return std::string(); 1274 return std::string();
1273 } 1275 }
1274 1276
1275 } // namespace options2 1277 } // namespace options2
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698