OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/extensions/extension_host.h" | 5 #include "chrome/browser/extensions/extension_host.h" |
6 | 6 |
7 #include <list> | 7 #include <list> |
8 | 8 |
9 #include "app/l10n_util.h" | 9 #include "app/l10n_util.h" |
10 #include "app/resource_bundle.h" | 10 #include "app/resource_bundle.h" |
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
195 // If the process is already started, go ahead and initialize the RenderView | 195 // If the process is already started, go ahead and initialize the RenderView |
196 // synchronously. The process creation is the real meaty part that we want | 196 // synchronously. The process creation is the real meaty part that we want |
197 // to defer. | 197 // to defer. |
198 CreateRenderViewNow(); | 198 CreateRenderViewNow(); |
199 } else { | 199 } else { |
200 ProcessCreationQueue::get()->CreateSoon(this); | 200 ProcessCreationQueue::get()->CreateSoon(this); |
201 } | 201 } |
202 } | 202 } |
203 | 203 |
204 void ExtensionHost::CreateRenderViewNow() { | 204 void ExtensionHost::CreateRenderViewNow() { |
205 render_view_host_->CreateRenderView(profile_->GetRequestContext(), | 205 render_view_host_->CreateRenderView(string16()); |
206 string16()); | |
207 NavigateToURL(url_); | 206 NavigateToURL(url_); |
208 DCHECK(IsRenderViewLive()); | 207 DCHECK(IsRenderViewLive()); |
209 } | 208 } |
210 | 209 |
211 void ExtensionHost::NavigateToURL(const GURL& url) { | 210 void ExtensionHost::NavigateToURL(const GURL& url) { |
212 LOG(INFO) << "Request to NavigateToURL " << url.spec() << " for " | 211 LOG(INFO) << "Request to NavigateToURL " << url.spec() << " for " |
213 << extension_->name(); | 212 << extension_->name(); |
214 // Prevent explicit navigation to another extension id's pages. | 213 // Prevent explicit navigation to another extension id's pages. |
215 // This method is only called by some APIs, so we still need to protect | 214 // This method is only called by some APIs, so we still need to protect |
216 // DidNavigate below (location = ""). | 215 // DidNavigate below (location = ""). |
(...skipping 515 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
732 // Extensions hosted in ExternalTabContainer objects may not have | 731 // Extensions hosted in ExternalTabContainer objects may not have |
733 // an associated browser. | 732 // an associated browser. |
734 Browser* browser = GetBrowser(); | 733 Browser* browser = GetBrowser(); |
735 if (browser) | 734 if (browser) |
736 window_id = ExtensionTabUtil::GetWindowId(browser); | 735 window_id = ExtensionTabUtil::GetWindowId(browser); |
737 } else if (extension_host_type_ != ViewType::EXTENSION_BACKGROUND_PAGE) { | 736 } else if (extension_host_type_ != ViewType::EXTENSION_BACKGROUND_PAGE) { |
738 NOTREACHED(); | 737 NOTREACHED(); |
739 } | 738 } |
740 return window_id; | 739 return window_id; |
741 } | 740 } |
OLD | NEW |