| 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 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 47 #include "extensions/common/constants.h" | 47 #include "extensions/common/constants.h" |
| 48 #include "extensions/common/extension.h" | 48 #include "extensions/common/extension.h" |
| 49 #include "extensions/common/extension_icon_set.h" | 49 #include "extensions/common/extension_icon_set.h" |
| 50 #include "extensions/common/extension_set.h" | 50 #include "extensions/common/extension_set.h" |
| 51 #include "extensions/common/manifest_handlers/background_info.h" | 51 #include "extensions/common/manifest_handlers/background_info.h" |
| 52 #include "extensions/common/manifest_handlers/icons_handler.h" | 52 #include "extensions/common/manifest_handlers/icons_handler.h" |
| 53 #include "extensions/grit/extensions_browser_resources.h" | 53 #include "extensions/grit/extensions_browser_resources.h" |
| 54 #include "ipc/ipc_message.h" | 54 #include "ipc/ipc_message.h" |
| 55 #include "ui/base/l10n/l10n_util.h" | 55 #include "ui/base/l10n/l10n_util.h" |
| 56 #include "ui/base/resource/resource_bundle.h" | 56 #include "ui/base/resource/resource_bundle.h" |
| 57 #include "ui/gfx/host_desktop_type.h" |
| 57 #include "ui/gfx/image/image.h" | 58 #include "ui/gfx/image/image.h" |
| 58 | 59 |
| 59 #if defined(ENABLE_NOTIFICATIONS) | 60 #if defined(ENABLE_NOTIFICATIONS) |
| 60 #include "ui/message_center/message_center.h" | 61 #include "ui/message_center/message_center.h" |
| 61 #endif | 62 #endif |
| 62 | 63 |
| 63 using content::SiteInstance; | 64 using content::SiteInstance; |
| 64 using content::WebContents; | 65 using content::WebContents; |
| 65 using extensions::BackgroundInfo; | 66 using extensions::BackgroundInfo; |
| 66 using extensions::Extension; | 67 using extensions::Extension; |
| (...skipping 712 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 779 bool user_gesture, | 780 bool user_gesture, |
| 780 bool* was_blocked) { | 781 bool* was_blocked) { |
| 781 Browser* browser = chrome::FindLastActiveWithProfile( | 782 Browser* browser = chrome::FindLastActiveWithProfile( |
| 782 Profile::FromBrowserContext(new_contents->GetBrowserContext()), | 783 Profile::FromBrowserContext(new_contents->GetBrowserContext()), |
| 783 chrome::GetActiveDesktop()); | 784 chrome::GetActiveDesktop()); |
| 784 if (browser) { | 785 if (browser) { |
| 785 chrome::AddWebContents(browser, NULL, new_contents, disposition, | 786 chrome::AddWebContents(browser, NULL, new_contents, disposition, |
| 786 initial_rect, user_gesture, was_blocked); | 787 initial_rect, user_gesture, was_blocked); |
| 787 } | 788 } |
| 788 } | 789 } |
| OLD | NEW |