| 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/native_app_window.h" |
| 7 #include "base/values.h" | 8 #include "base/values.h" |
| 8 #include "chrome/browser/chrome_notification_types.h" | 9 #include "chrome/browser/chrome_notification_types.h" |
| 9 #include "chrome/browser/extensions/api/tabs/tabs_constants.h" | 10 #include "chrome/browser/extensions/api/tabs/tabs_constants.h" |
| 10 #include "chrome/browser/extensions/api/tabs/tabs_windows_api.h" | 11 #include "chrome/browser/extensions/api/tabs/tabs_windows_api.h" |
| 11 #include "chrome/browser/extensions/api/tabs/windows_event_router.h" | 12 #include "chrome/browser/extensions/api/tabs/windows_event_router.h" |
| 12 #include "chrome/browser/extensions/extension_tab_util.h" | 13 #include "chrome/browser/extensions/extension_tab_util.h" |
| 13 #include "chrome/browser/extensions/window_controller_list.h" | 14 #include "chrome/browser/extensions/window_controller_list.h" |
| 14 #include "chrome/browser/profiles/profile.h" | 15 #include "chrome/browser/profiles/profile.h" |
| 15 #include "chrome/browser/sessions/session_tab_helper.h" | 16 #include "chrome/browser/sessions/session_tab_helper.h" |
| 16 #include "chrome/browser/ui/extensions/native_app_window.h" | |
| 17 #include "chrome/common/extensions/extension.h" | 17 #include "chrome/common/extensions/extension.h" |
| 18 #include "chrome/common/extensions/extension_messages.h" | 18 #include "chrome/common/extensions/extension_messages.h" |
| 19 #include "content/public/browser/site_instance.h" | 19 #include "content/public/browser/site_instance.h" |
| 20 #include "content/public/browser/web_contents.h" | 20 #include "content/public/browser/web_contents.h" |
| 21 #include "ui/gfx/image/image.h" | 21 #include "ui/gfx/image/image.h" |
| 22 | 22 |
| 23 using apps::ShellWindow; | 23 using apps::ShellWindow; |
| 24 using apps::NativeAppWindow; |
| 24 | 25 |
| 25 // AshPanelWindowController ---------------------------------------------------- | 26 // AshPanelWindowController ---------------------------------------------------- |
| 26 | 27 |
| 27 // This class enables a ShellWindow instance to be accessed (to a limited | 28 // This class enables a ShellWindow instance to be accessed (to a limited |
| 28 // extent) via the chrome.windows and chrome.tabs API. This is a temporary | 29 // extent) via the chrome.windows and chrome.tabs API. This is a temporary |
| 29 // bridge to support instantiating ShellWindows from v1 apps, specifically | 30 // bridge to support instantiating ShellWindows from v1 apps, specifically |
| 30 // for creating Panels in Ash. See crbug.com/160645. | 31 // for creating Panels in Ash. See crbug.com/160645. |
| 31 class AshPanelWindowController : public extensions::WindowController { | 32 class AshPanelWindowController : public extensions::WindowController { |
| 32 public: | 33 public: |
| 33 AshPanelWindowController(ShellWindow* window, Profile* profile); | 34 AshPanelWindowController(ShellWindow* window, Profile* profile); |
| (...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 235 | 236 |
| 236 content::WebContents* AshPanelContents::GetAssociatedWebContents() const { | 237 content::WebContents* AshPanelContents::GetAssociatedWebContents() const { |
| 237 return web_contents_.get(); | 238 return web_contents_.get(); |
| 238 } | 239 } |
| 239 | 240 |
| 240 void AshPanelContents::OnRequest( | 241 void AshPanelContents::OnRequest( |
| 241 const ExtensionHostMsg_Request_Params& params) { | 242 const ExtensionHostMsg_Request_Params& params) { |
| 242 extension_function_dispatcher_->Dispatch( | 243 extension_function_dispatcher_->Dispatch( |
| 243 params, web_contents_->GetRenderViewHost()); | 244 params, web_contents_->GetRenderViewHost()); |
| 244 } | 245 } |
| OLD | NEW |