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

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

Issue 7821010: Move web intents switch to content_switches. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Created 9 years, 3 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/ui/browser.cc ('k') | chrome/common/chrome_switches.h » ('j') | 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 <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 10 matching lines...) Expand all
21 #include "chrome/browser/notifications/desktop_notification_service.h" 21 #include "chrome/browser/notifications/desktop_notification_service.h"
22 #include "chrome/browser/notifications/desktop_notification_service_factory.h" 22 #include "chrome/browser/notifications/desktop_notification_service_factory.h"
23 #include "chrome/browser/profiles/profile.h" 23 #include "chrome/browser/profiles/profile.h"
24 #include "chrome/browser/ui/browser_list.h" 24 #include "chrome/browser/ui/browser_list.h"
25 #include "chrome/common/chrome_notification_types.h" 25 #include "chrome/common/chrome_notification_types.h"
26 #include "chrome/common/chrome_switches.h" 26 #include "chrome/common/chrome_switches.h"
27 #include "chrome/common/pref_names.h" 27 #include "chrome/common/pref_names.h"
28 #include "chrome/common/url_constants.h" 28 #include "chrome/common/url_constants.h"
29 #include "content/browser/tab_contents/tab_contents.h" 29 #include "content/browser/tab_contents/tab_contents.h"
30 #include "content/common/content_notification_types.h" 30 #include "content/common/content_notification_types.h"
31 #include "content/common/content_switches.h"
31 #include "content/common/notification_service.h" 32 #include "content/common/notification_service.h"
32 #include "content/common/notification_source.h" 33 #include "content/common/notification_source.h"
33 #include "grit/generated_resources.h" 34 #include "grit/generated_resources.h"
34 #include "grit/locale_settings.h" 35 #include "grit/locale_settings.h"
35 #include "ui/base/l10n/l10n_util.h" 36 #include "ui/base/l10n/l10n_util.h"
36 37
37 namespace { 38 namespace {
38 39
39 struct ContentSettingsTypeNameEntry { 40 struct ContentSettingsTypeNameEntry {
40 ContentSettingsType type; 41 ContentSettingsType type;
(...skipping 716 matching lines...) Expand 10 before | Expand all | Expand 10 after
757 return Profile::FromWebUI(web_ui_)->GetProtocolHandlerRegistry(); 758 return Profile::FromWebUI(web_ui_)->GetProtocolHandlerRegistry();
758 } 759 }
759 760
760 HostContentSettingsMap* 761 HostContentSettingsMap*
761 ContentSettingsHandler::GetOTRContentSettingsMap() { 762 ContentSettingsHandler::GetOTRContentSettingsMap() {
762 Profile* profile = Profile::FromWebUI(web_ui_); 763 Profile* profile = Profile::FromWebUI(web_ui_);
763 if (profile->HasOffTheRecordProfile()) 764 if (profile->HasOffTheRecordProfile())
764 return profile->GetOffTheRecordProfile()->GetHostContentSettingsMap(); 765 return profile->GetOffTheRecordProfile()->GetHostContentSettingsMap();
765 return NULL; 766 return NULL;
766 } 767 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser.cc ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698