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

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

Issue 10134026: Remove browser from web intents UI code (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Browser test compilation Created 8 years, 7 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
« no previous file with comments | « chrome/browser/ui/views/web_intent_picker_views.cc ('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) 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 <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after
295 IDS_POPUP_TAB_LABEL); 295 IDS_POPUP_TAB_LABEL);
296 RegisterTitle(localized_strings, "location", 296 RegisterTitle(localized_strings, "location",
297 IDS_GEOLOCATION_TAB_LABEL); 297 IDS_GEOLOCATION_TAB_LABEL);
298 RegisterTitle(localized_strings, "notifications", 298 RegisterTitle(localized_strings, "notifications",
299 IDS_NOTIFICATIONS_TAB_LABEL); 299 IDS_NOTIFICATIONS_TAB_LABEL);
300 RegisterTitle(localized_strings, "fullscreen", 300 RegisterTitle(localized_strings, "fullscreen",
301 IDS_FULLSCREEN_TAB_LABEL); 301 IDS_FULLSCREEN_TAB_LABEL);
302 RegisterTitle(localized_strings, "mouselock", 302 RegisterTitle(localized_strings, "mouselock",
303 IDS_MOUSE_LOCK_TAB_LABEL); 303 IDS_MOUSE_LOCK_TAB_LABEL);
304 304
305 Profile* profile = Profile::FromWebUI(web_ui());
305 localized_strings->SetBoolean("enable_web_intents", 306 localized_strings->SetBoolean("enable_web_intents",
306 web_intents::IsWebIntentsEnabled()); 307 web_intents::IsWebIntentsEnabled(profile));
307 // TODO(marja): clean up the options UI after the decision on the session 308 // TODO(marja): clean up the options UI after the decision on the session
308 // restore changes has stabilized. 309 // restore changes has stabilized.
309 localized_strings->SetBoolean( 310 localized_strings->SetBoolean(
310 "enable_restore_session_state", false); 311 "enable_restore_session_state", false);
311 } 312 }
312 313
313 void ContentSettingsHandler::InitializeHandler() { 314 void ContentSettingsHandler::InitializeHandler() {
314 notification_registrar_.Add( 315 notification_registrar_.Add(
315 this, chrome::NOTIFICATION_PROFILE_CREATED, 316 this, chrome::NOTIFICATION_PROFILE_CREATED,
316 content::NotificationService::AllSources()); 317 content::NotificationService::AllSources());
(...skipping 619 matching lines...) Expand 10 before | Expand all | Expand 10 after
936 937
937 HostContentSettingsMap* 938 HostContentSettingsMap*
938 ContentSettingsHandler::GetOTRContentSettingsMap() { 939 ContentSettingsHandler::GetOTRContentSettingsMap() {
939 Profile* profile = Profile::FromWebUI(web_ui()); 940 Profile* profile = Profile::FromWebUI(web_ui());
940 if (profile->HasOffTheRecordProfile()) 941 if (profile->HasOffTheRecordProfile())
941 return profile->GetOffTheRecordProfile()->GetHostContentSettingsMap(); 942 return profile->GetOffTheRecordProfile()->GetHostContentSettingsMap();
942 return NULL; 943 return NULL;
943 } 944 }
944 945
945 } // namespace options2 946 } // namespace options2
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/web_intent_picker_views.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698