| 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" |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 64 url_, content::Referrer(), ui::PAGE_TRANSITION_LINK, | 64 url_, content::Referrer(), ui::PAGE_TRANSITION_LINK, |
| 65 std::string()); | 65 std::string()); |
| 66 } | 66 } |
| 67 | 67 |
| 68 void AshPanelContents::NativeWindowChanged(NativeAppWindow* native_app_window) { | 68 void AshPanelContents::NativeWindowChanged(NativeAppWindow* native_app_window) { |
| 69 } | 69 } |
| 70 | 70 |
| 71 void AshPanelContents::NativeWindowClosed() { | 71 void AshPanelContents::NativeWindowClosed() { |
| 72 } | 72 } |
| 73 | 73 |
| 74 void AshPanelContents::DispatchWindowShownForTests() const { | |
| 75 } | |
| 76 | |
| 77 void AshPanelContents::OnWindowReady() {} | 74 void AshPanelContents::OnWindowReady() {} |
| 78 | 75 |
| 79 content::WebContents* AshPanelContents::GetWebContents() const { | 76 content::WebContents* AshPanelContents::GetWebContents() const { |
| 80 return web_contents_.get(); | 77 return web_contents_.get(); |
| 81 } | 78 } |
| 82 | 79 |
| 83 extensions::WindowController* AshPanelContents::GetWindowController() const { | 80 extensions::WindowController* AshPanelContents::GetWindowController() const { |
| 84 return nullptr; | 81 return nullptr; |
| 85 } | 82 } |
| 86 | 83 |
| 87 void AshPanelContents::FaviconUpdated() { | 84 void AshPanelContents::FaviconUpdated() { |
| 88 gfx::Image new_image = gfx::Image::CreateFrom1xBitmap( | 85 gfx::Image new_image = gfx::Image::CreateFrom1xBitmap( |
| 89 launcher_favicon_loader_->GetFavicon()); | 86 launcher_favicon_loader_->GetFavicon()); |
| 90 host_->UpdateAppIcon(new_image); | 87 host_->UpdateAppIcon(new_image); |
| 91 } | 88 } |
| OLD | NEW |