Add gfx::ImageSkia and icon support to aura::PropertyConverter.

services/ui/public/interfaces/window_manager.mojom

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 module ui.mojom;
 
 import "services/ui/public/interfaces/cursor.mojom";
 import "services/ui/public/interfaces/display/display.mojom";
 import "services/ui/public/interfaces/event_matcher.mojom";
 import "services/ui/public/interfaces/window_manager_constants.mojom";
 import "services/ui/public/interfaces/window_tree_constants.mojom";
 import "ui/events/mojo/event.mojom";
 import "ui/gfx/geometry/mojo/geometry.mojom";
 
 // WindowManager is used when a WindowTreeClient attempts to modify
 // a property of the embed root. When this happens WindowTree calls the
 // appropriate function on WindowManager. For example, if a
 // WindowTreeClient calls SetWindowBounds() on its embed root, WindowTree
 // calls WmSetBounds(). WindowManager can then decide if it wants to
 // change the bounds or not.
 //
 // This interface is only used as an associated interface and is associated
 // with WindowTreeClient, further WindowTree requests this interface from
 // WindowTreeClient supplied at the time the WindowTreeHost is created.
 interface WindowManager {
   // Whether the window is always on top. Type: bool.
   const string kAlwaysOnTop_Property = "prop:always_on_top";
+  // The application icon; typically larger for shelf icons, etc. Type: SkBitmap
+  const string kAppIcon_Property = "prop:app-icon";
   // Disables the window manager from handling immersive fullscreen for the
   // window. This is typically done if the client wants to handle immersive
   // themselves. Type: bool.
   const string kDisableImmersive_Property = "prop:disable_immersive";
   // Used to explicitly control whether a window appears in the most recently
   // used list of windows. Type: bool.
   const string kExcludeFromMru_Property = "prop:exclude_from_mru";
   // Initial bounds to create the window at. If empty the WindowManager decides
   // the initial bounds.
   const string kInitialBounds_Property = "prop:initial_bounds";
@@ skipping 22 matching lines @@
   const string kShadowStyle_Property = "prop:shadow-style";
   // The ID of the shelf item corresponding to this window. Type: int
   const string kShelfId_Property = "prop:shelf-id";
   // The type of item to be shown on the shelf for this window. Type: int
   // A few ash::ShelfItemType values are supported; TYPE_UNKNOWN means no item.
   const string kShelfItemType_Property = "prop:shelf-item-type";
   // The window's show state. Type: ShowState.
   const string kShowState_Property = "prop:show-state";
   // The window bounds as set by user input. Type: gfx::Rect.
   const string kUserSetBounds_Property = "prop:user-set-bounds";
-  // The window's app icon. Type: SkBitmap
-  const string kWindowAppIcon_Property = "prop:window-app-icon";
+  // The window icon; typically 16x16 for titlebars. Type: SkBitmap
+  const string kWindowIcon_Property = "prop:window-icon";
   // The window type. Type: mojom::WindowType
   const string kWindowType_Property = "prop:window-type";
   // The window's title. Type: mojom::String
   const string kWindowTitle_Property = "prop:window-title";
   // A flag controlling the window's presence on the mash shelf. Type: bool
   const string kWindowIgnoredByShelf_Property = "prop:window-ignored-by-shelf";
   // The application ID (eg. 'mojo:foo'). Type: mojom::String
   const string kAppID_Property = "prop:app-id";
   // Specifies that the system default caption and icon should not be rendered,
   // and the client area should be equivalent to the window area. Type: bool
@@ skipping 98 matching lines @@
   WmSetNonClientCursor(uint32 window_id, Cursor cursor_id);
 
   // Response from WmCreateTopLevelWindow() informing the client of the id for
   // the new window.
   OnWmCreatedTopLevelWindow(uint32 change_id, uint32 window_id);
 
   // See description in WindowManager::OnAccelerator(). |ack_id| is the value
   // that was passed to OnAccelerator().
   OnAcceleratorAck(uint32 ack_id, EventResult event_result);
 };