| 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 "base/values.h" | 7 #include "base/values.h" |
| 8 #include "chrome/browser/chrome_notification_types.h" | 8 #include "chrome/browser/chrome_notification_types.h" |
| 9 #include "chrome/browser/extensions/api/tabs/tabs_constants.h" | 9 #include "chrome/browser/extensions/api/tabs/tabs_constants.h" |
| 10 #include "chrome/browser/extensions/api/tabs/tabs_windows_api.h" | 10 #include "chrome/browser/extensions/api/tabs/tabs_windows_api.h" |
| 11 #include "chrome/browser/extensions/api/tabs/windows_event_router.h" | 11 #include "chrome/browser/extensions/api/tabs/windows_event_router.h" |
| 12 #include "chrome/browser/extensions/extension_tab_util.h" | 12 #include "chrome/browser/extensions/extension_tab_util.h" |
| 13 #include "chrome/browser/extensions/window_controller_list.h" | 13 #include "chrome/browser/extensions/window_controller_list.h" |
| 14 #include "chrome/browser/profiles/profile.h" | 14 #include "chrome/browser/profiles/profile.h" |
| 15 #include "chrome/browser/sessions/session_tab_helper.h" | 15 #include "chrome/browser/sessions/session_tab_helper.h" |
| 16 #include "content/public/browser/browser_context.h" | 16 #include "content/public/browser/browser_context.h" |
| 17 #include "content/public/browser/render_frame_host.h" | 17 #include "content/public/browser/render_frame_host.h" |
| 18 #include "content/public/browser/render_process_host.h" | 18 #include "content/public/browser/render_process_host.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 "extensions/browser/app_window/native_app_window.h" | 21 #include "extensions/browser/app_window/native_app_window.h" |
| 22 #include "extensions/common/extension.h" | 22 #include "extensions/common/extension.h" |
| 23 #include "extensions/common/permissions/api_permission.h" | 23 #include "extensions/common/permissions/api_permission.h" |
| 24 #include "extensions/common/permissions/permissions_data.h" | 24 #include "extensions/common/permissions/permissions_data.h" |
| 25 #include "third_party/skia/include/core/SkBitmap.h" |
| 25 #include "ui/gfx/image/image.h" | 26 #include "ui/gfx/image/image.h" |
| 26 | 27 |
| 27 using extensions::AppWindow; | 28 using extensions::AppWindow; |
| 28 using extensions::NativeAppWindow; | 29 using extensions::NativeAppWindow; |
| 29 | 30 |
| 30 // AshPanelContents ----------------------------------------------------- | 31 // AshPanelContents ----------------------------------------------------- |
| 31 | 32 |
| 32 AshPanelContents::AshPanelContents(AppWindow* host) : host_(host) {} | 33 AshPanelContents::AshPanelContents(AppWindow* host) : host_(host) {} |
| 33 | 34 |
| 34 AshPanelContents::~AshPanelContents() { | 35 AshPanelContents::~AshPanelContents() { |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 79 | 80 |
| 80 extensions::WindowController* AshPanelContents::GetWindowController() const { | 81 extensions::WindowController* AshPanelContents::GetWindowController() const { |
| 81 return nullptr; | 82 return nullptr; |
| 82 } | 83 } |
| 83 | 84 |
| 84 void AshPanelContents::FaviconUpdated() { | 85 void AshPanelContents::FaviconUpdated() { |
| 85 gfx::Image new_image = gfx::Image::CreateFrom1xBitmap( | 86 gfx::Image new_image = gfx::Image::CreateFrom1xBitmap( |
| 86 launcher_favicon_loader_->GetFavicon()); | 87 launcher_favicon_loader_->GetFavicon()); |
| 87 host_->UpdateAppIcon(new_image); | 88 host_->UpdateAppIcon(new_image); |
| 88 } | 89 } |
| OLD | NEW |