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

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

Issue 10636019: Adding Application Data dialog for isolated apps (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixes based on reviews by Thiago and Markus. 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 354 matching lines...) Expand 10 before | Expand all | Expand 10 after
365 // Cookies filter. 365 // Cookies filter.
366 { "cookies_tab_label", IDS_COOKIES_TAB_LABEL }, 366 { "cookies_tab_label", IDS_COOKIES_TAB_LABEL },
367 { "cookies_header", IDS_COOKIES_HEADER }, 367 { "cookies_header", IDS_COOKIES_HEADER },
368 { "cookies_allow", IDS_COOKIES_ALLOW_RADIO }, 368 { "cookies_allow", IDS_COOKIES_ALLOW_RADIO },
369 { "cookies_block", IDS_COOKIES_BLOCK_RADIO }, 369 { "cookies_block", IDS_COOKIES_BLOCK_RADIO },
370 { "cookies_session_only", IDS_COOKIES_SESSION_ONLY_RADIO }, 370 { "cookies_session_only", IDS_COOKIES_SESSION_ONLY_RADIO },
371 { "cookies_block_3rd_party", IDS_COOKIES_BLOCK_3RDPARTY_CHKBOX }, 371 { "cookies_block_3rd_party", IDS_COOKIES_BLOCK_3RDPARTY_CHKBOX },
372 { "cookies_clear_when_close", IDS_COOKIES_CLEAR_WHEN_CLOSE_CHKBOX }, 372 { "cookies_clear_when_close", IDS_COOKIES_CLEAR_WHEN_CLOSE_CHKBOX },
373 { "cookies_lso_clear_when_close", IDS_COOKIES_LSO_CLEAR_WHEN_CLOSE_CHKBOX }, 373 { "cookies_lso_clear_when_close", IDS_COOKIES_LSO_CLEAR_WHEN_CLOSE_CHKBOX },
374 { "cookies_show_cookies", IDS_COOKIES_SHOW_COOKIES_BUTTON }, 374 { "cookies_show_cookies", IDS_COOKIES_SHOW_COOKIES_BUTTON },
375 { "cookies_show_app_cookies", IDS_COOKIES_SHOW_APP_COOKIES_BUTTON },
375 { "flash_storage_settings", IDS_FLASH_STORAGE_SETTINGS }, 376 { "flash_storage_settings", IDS_FLASH_STORAGE_SETTINGS },
376 { "flash_storage_url", IDS_FLASH_STORAGE_URL }, 377 { "flash_storage_url", IDS_FLASH_STORAGE_URL },
377 // Image filter. 378 // Image filter.
378 { "images_tab_label", IDS_IMAGES_TAB_LABEL }, 379 { "images_tab_label", IDS_IMAGES_TAB_LABEL },
379 { "images_header", IDS_IMAGES_HEADER }, 380 { "images_header", IDS_IMAGES_HEADER },
380 { "images_allow", IDS_IMAGES_LOAD_RADIO }, 381 { "images_allow", IDS_IMAGES_LOAD_RADIO },
381 { "images_block", IDS_IMAGES_NOLOAD_RADIO }, 382 { "images_block", IDS_IMAGES_NOLOAD_RADIO },
382 // JavaScript filter. 383 // JavaScript filter.
383 { "javascript_tab_label", IDS_JAVASCRIPT_TAB_LABEL }, 384 { "javascript_tab_label", IDS_JAVASCRIPT_TAB_LABEL },
384 { "javascript_header", IDS_JAVASCRIPT_HEADER }, 385 { "javascript_header", IDS_JAVASCRIPT_HEADER },
(...skipping 885 matching lines...) Expand 10 before | Expand all | Expand 10 after
1270 for (size_t i = 0; i < arraysize(kExContentSettingsTypeGroupNames); ++i) { 1271 for (size_t i = 0; i < arraysize(kExContentSettingsTypeGroupNames); ++i) {
1271 if (type == kExContentSettingsTypeGroupNames[i].type) 1272 if (type == kExContentSettingsTypeGroupNames[i].type)
1272 return kExContentSettingsTypeGroupNames[i].name; 1273 return kExContentSettingsTypeGroupNames[i].name;
1273 } 1274 }
1274 1275
1275 NOTREACHED(); 1276 NOTREACHED();
1276 return std::string(); 1277 return std::string();
1277 } 1278 }
1278 1279
1279 } // namespace options2 1280 } // namespace options2
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698