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

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

Issue 15716012: Add a Preference for Google Services to Use the User's Location (Closed) Base URL: https://src.chromium.org/chrome/trunk/src/
Patch Set: Created 7 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
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/options/content_settings_handler.h" 5 #include "chrome/browser/ui/webui/options/content_settings_handler.h"
6 6
7 #include <map> 7 #include <map>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 280 matching lines...) Expand 10 before | Expand all | Expand 10 after
291 { "cookies_header", IDS_COOKIES_HEADER }, 291 { "cookies_header", IDS_COOKIES_HEADER },
292 { "cookies_allow", IDS_COOKIES_ALLOW_RADIO }, 292 { "cookies_allow", IDS_COOKIES_ALLOW_RADIO },
293 { "cookies_block", IDS_COOKIES_BLOCK_RADIO }, 293 { "cookies_block", IDS_COOKIES_BLOCK_RADIO },
294 { "cookies_session_only", IDS_COOKIES_SESSION_ONLY_RADIO }, 294 { "cookies_session_only", IDS_COOKIES_SESSION_ONLY_RADIO },
295 { "cookies_block_3rd_party", IDS_COOKIES_BLOCK_3RDPARTY_CHKBOX }, 295 { "cookies_block_3rd_party", IDS_COOKIES_BLOCK_3RDPARTY_CHKBOX },
296 { "cookies_clear_when_close", IDS_COOKIES_CLEAR_WHEN_CLOSE_CHKBOX }, 296 { "cookies_clear_when_close", IDS_COOKIES_CLEAR_WHEN_CLOSE_CHKBOX },
297 { "cookies_lso_clear_when_close", IDS_COOKIES_LSO_CLEAR_WHEN_CLOSE_CHKBOX }, 297 { "cookies_lso_clear_when_close", IDS_COOKIES_LSO_CLEAR_WHEN_CLOSE_CHKBOX },
298 { "cookies_show_cookies", IDS_COOKIES_SHOW_COOKIES_BUTTON }, 298 { "cookies_show_cookies", IDS_COOKIES_SHOW_COOKIES_BUTTON },
299 { "flash_storage_settings", IDS_FLASH_STORAGE_SETTINGS }, 299 { "flash_storage_settings", IDS_FLASH_STORAGE_SETTINGS },
300 { "flash_storage_url", IDS_FLASH_STORAGE_URL }, 300 { "flash_storage_url", IDS_FLASH_STORAGE_URL },
301 #if defined(ENABLE_GOOGLE_NOW)
302 { "googleGeolocationAccessEnable",
303 IDS_GEOLOCATION_GOOGLE_ACCESS_ENABLE },
vadimt 2013/06/07 19:13:44 Should end with _CHKBOX like IDS_COOKIES_LSO_CLEAR
robliao 2013/06/07 20:03:59 A lot of the checks strings in the setting page do
robliao 2013/06/07 20:04:52 *checkbox strings On 2013/06/07 20:03:59, Robert L
vadimt 2013/06/07 20:14:39 In the name of consistency with the rest of this f
robliao 2013/06/07 20:18:07 Ah, I see. Going forward, it seems like we should
304 #endif
301 // Image filter. 305 // Image filter.
302 { "images_tab_label", IDS_IMAGES_TAB_LABEL }, 306 { "images_tab_label", IDS_IMAGES_TAB_LABEL },
303 { "images_header", IDS_IMAGES_HEADER }, 307 { "images_header", IDS_IMAGES_HEADER },
304 { "images_allow", IDS_IMAGES_LOAD_RADIO }, 308 { "images_allow", IDS_IMAGES_LOAD_RADIO },
305 { "images_block", IDS_IMAGES_NOLOAD_RADIO }, 309 { "images_block", IDS_IMAGES_NOLOAD_RADIO },
306 // JavaScript filter. 310 // JavaScript filter.
307 { "javascript_tab_label", IDS_JAVASCRIPT_TAB_LABEL }, 311 { "javascript_tab_label", IDS_JAVASCRIPT_TAB_LABEL },
308 { "javascript_header", IDS_JAVASCRIPT_HEADER }, 312 { "javascript_header", IDS_JAVASCRIPT_HEADER },
309 { "javascript_allow", IDS_JS_ALLOW_RADIO }, 313 { "javascript_allow", IDS_JS_ALLOW_RADIO },
310 { "javascript_block", IDS_JS_DONOTALLOW_RADIO }, 314 { "javascript_block", IDS_JS_DONOTALLOW_RADIO },
(...skipping 1074 matching lines...) Expand 10 before | Expand all | Expand 10 after
1385 media_settings_.flash_default_setting, 1389 media_settings_.flash_default_setting,
1386 media_settings_.flash_exceptions, 1390 media_settings_.flash_exceptions,
1387 media_settings_.policy_disable_audio, 1391 media_settings_.policy_disable_audio,
1388 media_settings_.policy_disable_video)) { 1392 media_settings_.policy_disable_video)) {
1389 ShowFlashMediaLink(EXCEPTIONS, true); 1393 ShowFlashMediaLink(EXCEPTIONS, true);
1390 } 1394 }
1391 } 1395 }
1392 } 1396 }
1393 1397
1394 } // namespace options 1398 } // namespace options
OLDNEW
« no previous file with comments | « chrome/browser/resources/options/options_bundle.js ('k') | chrome/browser/ui/webui/options/geolocation_options_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698