chrome/browser/notifications/desktop_notification_service.cc - Issue 9030032: Get rid of a bunch of tab_contents.h includes from chrome. These are all trivial changes to use W...

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

Issue 9030032: Get rid of a bunch of tab_contents.h includes from chrome. These are all trivial changes to use W... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: fix cros 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/instant/instant_controller.cc ('k') | chrome/browser/prerender/prerender_browsertest.cc » ('j') | no next file with comments »

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/notifications/desktop_notification_service.h"	5 #include "chrome/browser/notifications/desktop_notification_service.h"

6	6

7 #include "base/metrics/histogram.h"	7 #include "base/metrics/histogram.h"

8 #include "base/threading/thread.h"	8 #include "base/threading/thread.h"

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

10 #include "chrome/browser/browser_process.h"	10 #include "chrome/browser/browser_process.h"

(...skipping 13 matching lines...) Expand all Loading...
24 #include "chrome/browser/ui/browser_list.h"	24 #include "chrome/browser/ui/browser_list.h"

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

26 #include "chrome/common/chrome_notification_types.h"	26 #include "chrome/common/chrome_notification_types.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/browser_child_process_host.h"	31 #include "content/browser/browser_child_process_host.h"

32 #include "content/browser/renderer_host/render_view_host.h"	32 #include "content/browser/renderer_host/render_view_host.h"

33 #include "content/browser/site_instance.h"	33 #include "content/browser/site_instance.h"

34 #include "content/browser/tab_contents/tab_contents.h"

35 #include "content/browser/worker_host/worker_process_host.h"	34 #include "content/browser/worker_host/worker_process_host.h"

36 #include "content/public/browser/browser_thread.h"	35 #include "content/public/browser/browser_thread.h"

37 #include "content/public/browser/notification_service.h"	36 #include "content/public/browser/notification_service.h"

	37 #include "content/public/browser/web_contents.h"

38 #include "content/public/common/show_desktop_notification_params.h"	38 #include "content/public/common/show_desktop_notification_params.h"

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

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

41 #include "grit/generated_resources.h"	41 #include "grit/generated_resources.h"

42 #include "grit/theme_resources_standard.h"	42 #include "grit/theme_resources_standard.h"

43 #include "net/base/escape.h"	43 #include "net/base/escape.h"

44 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h"	44 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h"

45 #include "ui/base/l10n/l10n_util.h"	45 #include "ui/base/l10n/l10n_util.h"

46 #include "ui/base/resource/resource_bundle.h"	46 #include "ui/base/resource/resource_bundle.h"

47	47

(...skipping 405 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
453	453

454 if (setting == CONTENT_SETTING_ALLOW)	454 if (setting == CONTENT_SETTING_ALLOW)

455 return WebKit::WebNotificationPresenter::PermissionAllowed;	455 return WebKit::WebNotificationPresenter::PermissionAllowed;

456 if (setting == CONTENT_SETTING_BLOCK)	456 if (setting == CONTENT_SETTING_BLOCK)

457 return WebKit::WebNotificationPresenter::PermissionDenied;	457 return WebKit::WebNotificationPresenter::PermissionDenied;

458 if (setting == CONTENT_SETTING_ASK)	458 if (setting == CONTENT_SETTING_ASK)

459 return WebKit::WebNotificationPresenter::PermissionNotAllowed;	459 return WebKit::WebNotificationPresenter::PermissionNotAllowed;

460 NOTREACHED() << "Invalid notifications settings value: " << setting;	460 NOTREACHED() << "Invalid notifications settings value: " << setting;

461 return WebKit::WebNotificationPresenter::PermissionNotAllowed;	461 return WebKit::WebNotificationPresenter::PermissionNotAllowed;

462 }	462 }

OLD	NEW