| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/api/tabs/ash_panel_contents.h" | 5 #include "chrome/browser/extensions/api/tabs/ash_panel_contents.h" |
| 6 | 6 |
| 7 #include "apps/ui/native_app_window.h" | 7 #include "apps/ui/native_app_window.h" |
| 8 #include "base/values.h" | 8 #include "base/values.h" |
| 9 #include "chrome/browser/chrome_notification_types.h" | 9 #include "chrome/browser/chrome_notification_types.h" |
| 10 #include "chrome/browser/extensions/api/tabs/tabs_constants.h" | 10 #include "chrome/browser/extensions/api/tabs/tabs_constants.h" |
| (...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 184 | 184 |
| 185 // Responsible for loading favicons for the Launcher, which uses different | 185 // Responsible for loading favicons for the Launcher, which uses different |
| 186 // logic than the FaviconTabHelper associated with web_contents_ | 186 // logic than the FaviconTabHelper associated with web_contents_ |
| 187 // (instantiated in AppWindow::Init()) | 187 // (instantiated in AppWindow::Init()) |
| 188 launcher_favicon_loader_.reset( | 188 launcher_favicon_loader_.reset( |
| 189 new LauncherFaviconLoader(this, web_contents_.get())); | 189 new LauncherFaviconLoader(this, web_contents_.get())); |
| 190 | 190 |
| 191 content::WebContentsObserver::Observe(web_contents_.get()); | 191 content::WebContentsObserver::Observe(web_contents_.get()); |
| 192 } | 192 } |
| 193 | 193 |
| 194 void AshPanelContents::LoadContents(int32 creator_process_id) { | 194 void AshPanelContents::LoadContents() { |
| 195 // This must be created after the native window has been created. | 195 // This must be created after the native window has been created. |
| 196 window_controller_.reset(new AshPanelWindowController( | 196 window_controller_.reset(new AshPanelWindowController( |
| 197 host_, Profile::FromBrowserContext(host_->browser_context()))); | 197 host_, Profile::FromBrowserContext(host_->browser_context()))); |
| 198 | 198 |
| 199 web_contents_->GetController().LoadURL( | 199 web_contents_->GetController().LoadURL( |
| 200 url_, content::Referrer(), content::PAGE_TRANSITION_LINK, | 200 url_, content::Referrer(), content::PAGE_TRANSITION_LINK, |
| 201 std::string()); | 201 std::string()); |
| 202 } | 202 } |
| 203 | 203 |
| 204 void AshPanelContents::NativeWindowChanged(NativeAppWindow* native_app_window) { | 204 void AshPanelContents::NativeWindowChanged(NativeAppWindow* native_app_window) { |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 238 | 238 |
| 239 content::WebContents* AshPanelContents::GetAssociatedWebContents() const { | 239 content::WebContents* AshPanelContents::GetAssociatedWebContents() const { |
| 240 return web_contents_.get(); | 240 return web_contents_.get(); |
| 241 } | 241 } |
| 242 | 242 |
| 243 void AshPanelContents::OnRequest( | 243 void AshPanelContents::OnRequest( |
| 244 const ExtensionHostMsg_Request_Params& params) { | 244 const ExtensionHostMsg_Request_Params& params) { |
| 245 extension_function_dispatcher_->Dispatch( | 245 extension_function_dispatcher_->Dispatch( |
| 246 params, web_contents_->GetRenderViewHost()); | 246 params, web_contents_->GetRenderViewHost()); |
| 247 } | 247 } |
| OLD | NEW |