| 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 126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 137 // be OK, but it causes a crash on Mac, see: http://crbug.com/78167 | 137 // be OK, but it causes a crash on Mac, see: http://crbug.com/78167 |
| 138 ScheduleCloseBalloon(copied_extension_id); | 138 ScheduleCloseBalloon(copied_extension_id); |
| 139 } | 139 } |
| 140 | 140 |
| 141 virtual bool HasClickedListener() OVERRIDE { return true; } | 141 virtual bool HasClickedListener() OVERRIDE { return true; } |
| 142 | 142 |
| 143 virtual std::string id() const OVERRIDE { | 143 virtual std::string id() const OVERRIDE { |
| 144 return kNotificationPrefix + extension_id_; | 144 return kNotificationPrefix + extension_id_; |
| 145 } | 145 } |
| 146 | 146 |
| 147 virtual content::WebContents* GetWebContents() const OVERRIDE { | |
| 148 return NULL; | |
| 149 } | |
| 150 | |
| 151 private: | 147 private: |
| 152 virtual ~CrashNotificationDelegate() {} | 148 virtual ~CrashNotificationDelegate() {} |
| 153 | 149 |
| 154 Profile* profile_; | 150 Profile* profile_; |
| 155 bool is_hosted_app_; | 151 bool is_hosted_app_; |
| 156 bool is_platform_app_; | 152 bool is_platform_app_; |
| 157 std::string extension_id_; | 153 std::string extension_id_; |
| 158 | 154 |
| 159 DISALLOW_COPY_AND_ASSIGN(CrashNotificationDelegate); | 155 DISALLOW_COPY_AND_ASSIGN(CrashNotificationDelegate); |
| 160 }; | 156 }; |
| (...skipping 613 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 774 bool user_gesture, | 770 bool user_gesture, |
| 775 bool* was_blocked) { | 771 bool* was_blocked) { |
| 776 Browser* browser = chrome::FindLastActiveWithProfile( | 772 Browser* browser = chrome::FindLastActiveWithProfile( |
| 777 Profile::FromBrowserContext(new_contents->GetBrowserContext()), | 773 Profile::FromBrowserContext(new_contents->GetBrowserContext()), |
| 778 chrome::GetActiveDesktop()); | 774 chrome::GetActiveDesktop()); |
| 779 if (browser) { | 775 if (browser) { |
| 780 chrome::AddWebContents(browser, NULL, new_contents, disposition, | 776 chrome::AddWebContents(browser, NULL, new_contents, disposition, |
| 781 initial_pos, user_gesture, was_blocked); | 777 initial_pos, user_gesture, was_blocked); |
| 782 } | 778 } |
| 783 } | 779 } |
| OLD | NEW |