Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1164)

Unified Diff: components/exo/shell_surface.cc

Issue 2900783003: Handle app custom icon via aura::Window property. (Closed)
Patch Set: fix mac compile Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/exo/shell_surface.h ('k') | extensions/browser/api/app_window/app_window_apitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/exo/shell_surface.cc
diff --git a/components/exo/shell_surface.cc b/components/exo/shell_surface.cc
index a87a22af56e0276a7614d8091199e648e740e661..b22b47bc13951b28efac24fd2f4cb74e2ef8c858 100644
--- a/components/exo/shell_surface.cc
+++ b/components/exo/shell_surface.cc
@@ -492,6 +492,14 @@ void ShellSurface::SetTitle(const base::string16& title) {
widget_->UpdateWindowTitle();
}
+void ShellSurface::SetIcon(const gfx::ImageSkia& icon) {
+ TRACE_EVENT0("exo", "ShellSurface::SetIcon");
+
+ icon_ = icon;
+ if (widget_)
+ widget_->UpdateWindowIcon();
+}
+
void ShellSurface::SetSystemModal(bool system_modal) {
// System modal container is used by clients to implement client side
// managed system modal dialogs using a single ShellSurface instance.
@@ -829,6 +837,10 @@ base::string16 ShellSurface::GetWindowTitle() const {
return title_;
}
+gfx::ImageSkia ShellSurface::GetWindowIcon() {
+ return icon_;
+}
+
void ShellSurface::SaveWindowPlacement(const gfx::Rect& bounds,
ui::WindowShowState show_state) {
if (bounds_mode_ != BoundsMode::CLIENT)
« no previous file with comments | « components/exo/shell_surface.h ('k') | extensions/browser/api/app_window/app_window_apitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698