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

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

Issue 10636019: Adding Application Data dialog for isolated apps (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed merge conflicts Created 8 years, 5 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_handler.h" 5 #include "chrome/browser/ui/webui/options2/content_settings_handler.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 357 matching lines...) Expand 10 before | Expand all | Expand 10 after
368 // Cookies filter. 368 // Cookies filter.
369 { "cookies_tab_label", IDS_COOKIES_TAB_LABEL }, 369 { "cookies_tab_label", IDS_COOKIES_TAB_LABEL },
370 { "cookies_header", IDS_COOKIES_HEADER }, 370 { "cookies_header", IDS_COOKIES_HEADER },
371 { "cookies_allow", IDS_COOKIES_ALLOW_RADIO }, 371 { "cookies_allow", IDS_COOKIES_ALLOW_RADIO },
372 { "cookies_block", IDS_COOKIES_BLOCK_RADIO }, 372 { "cookies_block", IDS_COOKIES_BLOCK_RADIO },
373 { "cookies_session_only", IDS_COOKIES_SESSION_ONLY_RADIO }, 373 { "cookies_session_only", IDS_COOKIES_SESSION_ONLY_RADIO },
374 { "cookies_block_3rd_party", IDS_COOKIES_BLOCK_3RDPARTY_CHKBOX }, 374 { "cookies_block_3rd_party", IDS_COOKIES_BLOCK_3RDPARTY_CHKBOX },
375 { "cookies_clear_when_close", IDS_COOKIES_CLEAR_WHEN_CLOSE_CHKBOX }, 375 { "cookies_clear_when_close", IDS_COOKIES_CLEAR_WHEN_CLOSE_CHKBOX },
376 { "cookies_lso_clear_when_close", IDS_COOKIES_LSO_CLEAR_WHEN_CLOSE_CHKBOX }, 376 { "cookies_lso_clear_when_close", IDS_COOKIES_LSO_CLEAR_WHEN_CLOSE_CHKBOX },
377 { "cookies_show_cookies", IDS_COOKIES_SHOW_COOKIES_BUTTON }, 377 { "cookies_show_cookies", IDS_COOKIES_SHOW_COOKIES_BUTTON },
378 { "cookies_show_app_cookies", IDS_COOKIES_SHOW_APP_COOKIES_BUTTON },
378 { "flash_storage_settings", IDS_FLASH_STORAGE_SETTINGS }, 379 { "flash_storage_settings", IDS_FLASH_STORAGE_SETTINGS },
379 { "flash_storage_url", IDS_FLASH_STORAGE_URL }, 380 { "flash_storage_url", IDS_FLASH_STORAGE_URL },
380 // Image filter. 381 // Image filter.
381 { "images_tab_label", IDS_IMAGES_TAB_LABEL }, 382 { "images_tab_label", IDS_IMAGES_TAB_LABEL },
382 { "images_header", IDS_IMAGES_HEADER }, 383 { "images_header", IDS_IMAGES_HEADER },
383 { "images_allow", IDS_IMAGES_LOAD_RADIO }, 384 { "images_allow", IDS_IMAGES_LOAD_RADIO },
384 { "images_block", IDS_IMAGES_NOLOAD_RADIO }, 385 { "images_block", IDS_IMAGES_NOLOAD_RADIO },
385 // JavaScript filter. 386 // JavaScript filter.
386 { "javascript_tab_label", IDS_JAVASCRIPT_TAB_LABEL }, 387 { "javascript_tab_label", IDS_JAVASCRIPT_TAB_LABEL },
387 { "javascript_header", IDS_JAVASCRIPT_HEADER }, 388 { "javascript_header", IDS_JAVASCRIPT_HEADER },
(...skipping 935 matching lines...) Expand 10 before | Expand all | Expand 10 after
1323 for (size_t i = 0; i < arraysize(kExContentSettingsTypeGroupNames); ++i) { 1324 for (size_t i = 0; i < arraysize(kExContentSettingsTypeGroupNames); ++i) {
1324 if (type == kExContentSettingsTypeGroupNames[i].type) 1325 if (type == kExContentSettingsTypeGroupNames[i].type)
1325 return kExContentSettingsTypeGroupNames[i].name; 1326 return kExContentSettingsTypeGroupNames[i].name;
1326 } 1327 }
1327 1328
1328 NOTREACHED(); 1329 NOTREACHED();
1329 return std::string(); 1330 return std::string();
1330 } 1331 }
1331 1332
1332 } // namespace options2 1333 } // namespace options2
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/cookies_tree_model_util.cc ('k') | chrome/browser/ui/webui/options2/cookies_view_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698