| 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 483 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 494 ShutdownAssociatedBackgroundContents(base::ASCIIToUTF16( | 494 ShutdownAssociatedBackgroundContents(base::ASCIIToUTF16( |
| 495 content::Details<UnloadedExtensionInfo>(details)-> | 495 content::Details<UnloadedExtensionInfo>(details)-> |
| 496 extension->id())); | 496 extension->id())); |
| 497 break; | 497 break; |
| 498 } | 498 } |
| 499 break; | 499 break; |
| 500 | 500 |
| 501 case chrome::NOTIFICATION_EXTENSION_UNINSTALLED_DEPRECATED: { | 501 case chrome::NOTIFICATION_EXTENSION_UNINSTALLED_DEPRECATED: { |
| 502 // Close the crash notification balloon for the app/extension, if any. | 502 // Close the crash notification balloon for the app/extension, if any. |
| 503 ScheduleCloseBalloon( | 503 ScheduleCloseBalloon( |
| 504 content::Details<const Extension>(details).ptr()->id()); | 504 content::Details<extensions::UninstalledExtensionInfo>(details) |
| 505 ->extension->id()); |
| 505 break; | 506 break; |
| 506 } | 507 } |
| 507 | 508 |
| 508 default: | 509 default: |
| 509 NOTREACHED(); | 510 NOTREACHED(); |
| 510 break; | 511 break; |
| 511 } | 512 } |
| 512 } | 513 } |
| 513 | 514 |
| 514 void BackgroundContentsService::RestartForceInstalledExtensionOnCrash( | 515 void BackgroundContentsService::RestartForceInstalledExtensionOnCrash( |
| (...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 786 bool user_gesture, | 787 bool user_gesture, |
| 787 bool* was_blocked) { | 788 bool* was_blocked) { |
| 788 Browser* browser = chrome::FindLastActiveWithProfile( | 789 Browser* browser = chrome::FindLastActiveWithProfile( |
| 789 Profile::FromBrowserContext(new_contents->GetBrowserContext()), | 790 Profile::FromBrowserContext(new_contents->GetBrowserContext()), |
| 790 chrome::GetActiveDesktop()); | 791 chrome::GetActiveDesktop()); |
| 791 if (browser) { | 792 if (browser) { |
| 792 chrome::AddWebContents(browser, NULL, new_contents, disposition, | 793 chrome::AddWebContents(browser, NULL, new_contents, disposition, |
| 793 initial_pos, user_gesture, was_blocked); | 794 initial_pos, user_gesture, was_blocked); |
| 794 } | 795 } |
| 795 } | 796 } |
| OLD | NEW |