| OLD | NEW |
| 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/background/background_contents_service.h" | 5 #include "chrome/browser/background/background_contents_service.h" |
| 6 | 6 |
| 7 #include "apps/app_load_service.h" | 7 #include "apps/app_load_service.h" |
| 8 #include "base/basictypes.h" | 8 #include "base/basictypes.h" |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 14 matching lines...) Expand all Loading... |
| 25 #include "chrome/browser/notifications/notification_delegate.h" | 25 #include "chrome/browser/notifications/notification_delegate.h" |
| 26 #include "chrome/browser/notifications/notification_ui_manager.h" | 26 #include "chrome/browser/notifications/notification_ui_manager.h" |
| 27 #include "chrome/browser/profiles/profile.h" | 27 #include "chrome/browser/profiles/profile.h" |
| 28 #include "chrome/browser/profiles/profile_manager.h" | 28 #include "chrome/browser/profiles/profile_manager.h" |
| 29 #include "chrome/browser/ui/browser.h" | 29 #include "chrome/browser/ui/browser.h" |
| 30 #include "chrome/browser/ui/browser_finder.h" | 30 #include "chrome/browser/ui/browser_finder.h" |
| 31 #include "chrome/browser/ui/browser_tabstrip.h" | 31 #include "chrome/browser/ui/browser_tabstrip.h" |
| 32 #include "chrome/browser/ui/host_desktop.h" | 32 #include "chrome/browser/ui/host_desktop.h" |
| 33 #include "chrome/common/extensions/extension_constants.h" | 33 #include "chrome/common/extensions/extension_constants.h" |
| 34 #include "chrome/common/pref_names.h" | 34 #include "chrome/common/pref_names.h" |
| 35 #include "chrome/grit/generated_resources.h" |
| 35 #include "content/public/browser/notification_service.h" | 36 #include "content/public/browser/notification_service.h" |
| 36 #include "content/public/browser/site_instance.h" | 37 #include "content/public/browser/site_instance.h" |
| 37 #include "content/public/browser/web_contents.h" | 38 #include "content/public/browser/web_contents.h" |
| 38 #include "extensions/browser/extension_host.h" | 39 #include "extensions/browser/extension_host.h" |
| 39 #include "extensions/browser/extension_registry.h" | 40 #include "extensions/browser/extension_registry.h" |
| 40 #include "extensions/browser/extension_system.h" | 41 #include "extensions/browser/extension_system.h" |
| 41 #include "extensions/browser/image_loader.h" | 42 #include "extensions/browser/image_loader.h" |
| 42 #include "extensions/browser/notification_types.h" | 43 #include "extensions/browser/notification_types.h" |
| 43 #include "extensions/common/constants.h" | 44 #include "extensions/common/constants.h" |
| 44 #include "extensions/common/extension.h" | 45 #include "extensions/common/extension.h" |
| 45 #include "extensions/common/extension_icon_set.h" | 46 #include "extensions/common/extension_icon_set.h" |
| 46 #include "extensions/common/extension_set.h" | 47 #include "extensions/common/extension_set.h" |
| 47 #include "extensions/common/manifest_handlers/background_info.h" | 48 #include "extensions/common/manifest_handlers/background_info.h" |
| 48 #include "extensions/common/manifest_handlers/icons_handler.h" | 49 #include "extensions/common/manifest_handlers/icons_handler.h" |
| 49 #include "grit/generated_resources.h" | |
| 50 #include "grit/theme_resources.h" | 50 #include "grit/theme_resources.h" |
| 51 #include "ipc/ipc_message.h" | 51 #include "ipc/ipc_message.h" |
| 52 #include "ui/base/l10n/l10n_util.h" | 52 #include "ui/base/l10n/l10n_util.h" |
| 53 #include "ui/base/resource/resource_bundle.h" | 53 #include "ui/base/resource/resource_bundle.h" |
| 54 #include "ui/gfx/image/image.h" | 54 #include "ui/gfx/image/image.h" |
| 55 | 55 |
| 56 #if defined(ENABLE_NOTIFICATIONS) | 56 #if defined(ENABLE_NOTIFICATIONS) |
| 57 #include "ui/message_center/message_center.h" | 57 #include "ui/message_center/message_center.h" |
| 58 #endif | 58 #endif |
| 59 | 59 |
| (...skipping 714 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 774 bool user_gesture, | 774 bool user_gesture, |
| 775 bool* was_blocked) { | 775 bool* was_blocked) { |
| 776 Browser* browser = chrome::FindLastActiveWithProfile( | 776 Browser* browser = chrome::FindLastActiveWithProfile( |
| 777 Profile::FromBrowserContext(new_contents->GetBrowserContext()), | 777 Profile::FromBrowserContext(new_contents->GetBrowserContext()), |
| 778 chrome::GetActiveDesktop()); | 778 chrome::GetActiveDesktop()); |
| 779 if (browser) { | 779 if (browser) { |
| 780 chrome::AddWebContents(browser, NULL, new_contents, disposition, | 780 chrome::AddWebContents(browser, NULL, new_contents, disposition, |
| 781 initial_pos, user_gesture, was_blocked); | 781 initial_pos, user_gesture, was_blocked); |
| 782 } | 782 } |
| 783 } | 783 } |
| OLD | NEW |