chrome/browser/notifications/desktop_notification_service.cc - Issue 3203008: Move prefs-related files under chrome/browser/ into a prefs/ subdir.

Side by Side Diff: chrome/browser/notifications/desktop_notification_service.cc

Issue 3203008: Move prefs-related files under chrome/browser/ into a prefs/ subdir. (Closed) Base URL: http://src.chromium.org/git/chromium.git

Patch Set: Created 10 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

« no previous file with comments | « chrome/browser/net/ssl_config_service_manager_pref.cc ('k') | chrome/browser/notifications/desktop_notification_service_unittest.cc » ('j') | chrome/chrome_browser.gypi » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2010 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/notifications/desktop_notification_service.h"	5 #include "chrome/browser/notifications/desktop_notification_service.h"

6	6

7 #include "app/l10n_util.h"	7 #include "app/l10n_util.h"

8 #include "app/resource_bundle.h"	8 #include "app/resource_bundle.h"

9 #include "base/thread.h"	9 #include "base/thread.h"

10 #include "base/utf_string_conversions.h"	10 #include "base/utf_string_conversions.h"

11 #include "chrome/browser/browser_child_process_host.h"	11 #include "chrome/browser/browser_child_process_host.h"

12 #include "chrome/browser/chrome_thread.h"	12 #include "chrome/browser/chrome_thread.h"

13 #include "chrome/browser/extensions/extensions_service.h"	13 #include "chrome/browser/extensions/extensions_service.h"

14 #include "chrome/browser/notifications/notification.h"	14 #include "chrome/browser/notifications/notification.h"

15 #include "chrome/browser/notifications/notification_object_proxy.h"	15 #include "chrome/browser/notifications/notification_object_proxy.h"

16 #include "chrome/browser/notifications/notification_ui_manager.h"	16 #include "chrome/browser/notifications/notification_ui_manager.h"

17 #include "chrome/browser/notifications/notifications_prefs_cache.h"	17 #include "chrome/browser/notifications/notifications_prefs_cache.h"

18 #include "chrome/browser/pref_service.h"	18 #include "chrome/browser/prefs/pref_service.h"

	19 #include "chrome/browser/prefs/scoped_pref_update.h"

19 #include "chrome/browser/profile.h"	20 #include "chrome/browser/profile.h"

20 #include "chrome/browser/renderer_host/render_process_host.h"	21 #include "chrome/browser/renderer_host/render_process_host.h"

21 #include "chrome/browser/renderer_host/render_view_host.h"	22 #include "chrome/browser/renderer_host/render_view_host.h"

22 #include "chrome/browser/renderer_host/site_instance.h"	23 #include "chrome/browser/renderer_host/site_instance.h"

23 #include "chrome/browser/scoped_pref_update.h"

24 #include "chrome/browser/tab_contents/infobar_delegate.h"	24 #include "chrome/browser/tab_contents/infobar_delegate.h"

25 #include "chrome/browser/tab_contents/tab_contents.h"	25 #include "chrome/browser/tab_contents/tab_contents.h"

26 #include "chrome/browser/worker_host/worker_process_host.h"	26 #include "chrome/browser/worker_host/worker_process_host.h"

27 #include "chrome/common/notification_service.h"	27 #include "chrome/common/notification_service.h"

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

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

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

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

32 #include "grit/browser_resources.h"	32 #include "grit/browser_resources.h"

33 #include "grit/chromium_strings.h"	33 #include "grit/chromium_strings.h"

(...skipping 544 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
578 if (origin.SchemeIs(chrome::kExtensionScheme)) {	578 if (origin.SchemeIs(chrome::kExtensionScheme)) {

579 ExtensionsService* ext_service = profile_->GetExtensionsService();	579 ExtensionsService* ext_service = profile_->GetExtensionsService();

580 if (ext_service) {	580 if (ext_service) {

581 Extension* extension = ext_service->GetExtensionByURL(origin);	581 Extension* extension = ext_service->GetExtensionByURL(origin);

582 if (extension)	582 if (extension)

583 return UTF8ToUTF16(extension->name());	583 return UTF8ToUTF16(extension->name());

584 }	584 }

585 }	585 }

586 return UTF8ToUTF16(origin.host());	586 return UTF8ToUTF16(origin.host());

587 }	587 }

OLD	NEW