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