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

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

Issue 7508046: Options: Fix the disable individual plugins link. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 4 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
« no previous file with comments | « chrome/browser/resources/options/content_settings.html ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after
231 { "javascript_tab_label", IDS_JAVASCRIPT_TAB_LABEL }, 231 { "javascript_tab_label", IDS_JAVASCRIPT_TAB_LABEL },
232 { "javascript_header", IDS_JAVASCRIPT_HEADER }, 232 { "javascript_header", IDS_JAVASCRIPT_HEADER },
233 { "javascript_allow", IDS_JS_ALLOW_RADIO }, 233 { "javascript_allow", IDS_JS_ALLOW_RADIO },
234 { "javascript_block", IDS_JS_DONOTALLOW_RADIO }, 234 { "javascript_block", IDS_JS_DONOTALLOW_RADIO },
235 // Plug-ins filter. 235 // Plug-ins filter.
236 { "plugins_tab_label", IDS_PLUGIN_TAB_LABEL }, 236 { "plugins_tab_label", IDS_PLUGIN_TAB_LABEL },
237 { "plugins_header", IDS_PLUGIN_HEADER }, 237 { "plugins_header", IDS_PLUGIN_HEADER },
238 { "plugins_ask", IDS_PLUGIN_ASK_RADIO }, 238 { "plugins_ask", IDS_PLUGIN_ASK_RADIO },
239 { "plugins_allow", IDS_PLUGIN_LOAD_RADIO }, 239 { "plugins_allow", IDS_PLUGIN_LOAD_RADIO },
240 { "plugins_block", IDS_PLUGIN_NOLOAD_RADIO }, 240 { "plugins_block", IDS_PLUGIN_NOLOAD_RADIO },
241 { "disable_individual_plugins", IDS_PLUGIN_SELECTIVE_DISABLE }, 241 { "disableIndividualPlugins", IDS_PLUGIN_SELECTIVE_DISABLE },
242 // Pop-ups filter. 242 // Pop-ups filter.
243 { "popups_tab_label", IDS_POPUP_TAB_LABEL }, 243 { "popups_tab_label", IDS_POPUP_TAB_LABEL },
244 { "popups_header", IDS_POPUP_HEADER }, 244 { "popups_header", IDS_POPUP_HEADER },
245 { "popups_allow", IDS_POPUP_ALLOW_RADIO }, 245 { "popups_allow", IDS_POPUP_ALLOW_RADIO },
246 { "popups_block", IDS_POPUP_BLOCK_RADIO }, 246 { "popups_block", IDS_POPUP_BLOCK_RADIO },
247 // Location filter. 247 // Location filter.
248 { "location_tab_label", IDS_GEOLOCATION_TAB_LABEL }, 248 { "location_tab_label", IDS_GEOLOCATION_TAB_LABEL },
249 { "location_header", IDS_GEOLOCATION_HEADER }, 249 { "location_header", IDS_GEOLOCATION_HEADER },
250 { "location_allow", IDS_GEOLOCATION_ALLOW_RADIO }, 250 { "location_allow", IDS_GEOLOCATION_ALLOW_RADIO },
251 { "location_ask", IDS_GEOLOCATION_ASK_RADIO }, 251 { "location_ask", IDS_GEOLOCATION_ASK_RADIO },
(...skipping 465 matching lines...) Expand 10 before | Expand all | Expand 10 after
717 return web_ui_->GetProfile()->GetProtocolHandlerRegistry(); 717 return web_ui_->GetProfile()->GetProtocolHandlerRegistry();
718 } 718 }
719 719
720 HostContentSettingsMap* 720 HostContentSettingsMap*
721 ContentSettingsHandler::GetOTRContentSettingsMap() { 721 ContentSettingsHandler::GetOTRContentSettingsMap() {
722 Profile* profile = web_ui_->GetProfile(); 722 Profile* profile = web_ui_->GetProfile();
723 if (profile->HasOffTheRecordProfile()) 723 if (profile->HasOffTheRecordProfile())
724 return profile->GetOffTheRecordProfile()->GetHostContentSettingsMap(); 724 return profile->GetOffTheRecordProfile()->GetHostContentSettingsMap();
725 return NULL; 725 return NULL;
726 } 726 }
OLDNEW
« no previous file with comments | « chrome/browser/resources/options/content_settings.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698