chrome/browser/ui/webui/options2/content_settings_handler2.cc - Issue 9224002: Make WebUI objects not derive from WebUI. WebUI objects own the controller. This is the ownership...

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

Issue 9224002: Make WebUI objects not derive from WebUI. WebUI objects own the controller. This is the ownership... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: sync to head to clear linux_chromeos browsertest failures Created 8 years, 11 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/webui/options2/clear_browser_data_handler2.cc ('k') | chrome/browser/ui/webui/options2/cookies_view_handler2.cc » ('j') | content/browser/tab_contents/render_view_host_manager_unittest.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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/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 10 matching lines...) Expand all Loading...
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/content_settings.h"	27 #include "chrome/common/content_settings.h"

28 #include "chrome/common/content_settings_pattern.h"	28 #include "chrome/common/content_settings_pattern.h"

29 #include "chrome/common/pref_names.h"	29 #include "chrome/common/pref_names.h"

30 #include "chrome/common/url_constants.h"	30 #include "chrome/common/url_constants.h"

	31 #include "content/browser/webui/web_ui.h"

31 #include "content/public/browser/notification_service.h"	32 #include "content/public/browser/notification_service.h"

32 #include "content/public/browser/notification_source.h"	33 #include "content/public/browser/notification_source.h"

33 #include "content/public/browser/notification_types.h"	34 #include "content/public/browser/notification_types.h"

34 #include "content/public/browser/user_metrics.h"	35 #include "content/public/browser/user_metrics.h"

35 #include "content/public/common/content_switches.h"	36 #include "content/public/common/content_switches.h"

36 #include "grit/generated_resources.h"	37 #include "grit/generated_resources.h"

37 #include "grit/locale_settings.h"	38 #include "grit/locale_settings.h"

38 #include "ui/base/l10n/l10n_util.h"	39 #include "ui/base/l10n/l10n_util.h"

39	40

40 using content::UserMetricsAction;	41 using content::UserMetricsAction;

(...skipping 832 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
873	874

874 HostContentSettingsMap*	875 HostContentSettingsMap*

875 ContentSettingsHandler::GetOTRContentSettingsMap() {	876 ContentSettingsHandler::GetOTRContentSettingsMap() {

876 Profile* profile = Profile::FromWebUI(web_ui());	877 Profile* profile = Profile::FromWebUI(web_ui());

877 if (profile->HasOffTheRecordProfile())	878 if (profile->HasOffTheRecordProfile())

878 return profile->GetOffTheRecordProfile()->GetHostContentSettingsMap();	879 return profile->GetOffTheRecordProfile()->GetHostContentSettingsMap();

879 return NULL;	880 return NULL;

880 }	881 }

881	882

882 } // namespace options2	883 } // namespace options2

OLD	NEW