Enhance chrome.app.window API with better shelf integration

extensions/browser/app_window/app_window.h

Index: extensions/browser/app_window/app_window.h
diff --git a/extensions/browser/app_window/app_window.h b/extensions/browser/app_window/app_window.h
index e41575dae1a383defc1ffb3041ad6ba1621543f5..b69197734a7324e5fc1214bfdbb57f64cbfd8e50 100644
--- a/extensions/browser/app_window/app_window.h
+++ b/extensions/browser/app_window/app_window.h
@@ -191,6 +191,10 @@ class AppWindow : public content::WebContentsDelegate,
     // If true, the window will be visible on all workspaces. Defaults to false.
     bool visible_on_all_workspaces;
 
+    // If true, the window will be tied to its own icon in the shelf instead of
+    // being folded in the menu of the parent app. Defaults to false.
+    bool show_in_shelf;
+
     // The API enables developers to specify content or window bounds. This
     // function combines them into a single, constrained window size.
     gfx::Rect GetInitialWindowBounds(const gfx::Insets& frame_insets) const;
@@ -368,6 +372,9 @@ class AppWindow : public content::WebContentsDelegate,
   // remove this TODO.
   bool is_ime_window() const { return is_ime_window_; }
 
+  // Whether the app window will create its own icon in the shelf.
+  bool show_in_shelf() const { return show_in_shelf_; }
+
   void SetAppWindowContentsForTesting(scoped_ptr<AppWindowContents> contents) {
     app_window_contents_ = std::move(contents);
   }
@@ -566,6 +573,9 @@ class AppWindow : public content::WebContentsDelegate,
   // Whether |is_ime_window| was set in the CreateParams.
   bool is_ime_window_;
 
+  // Whether |show_in_shelf| was set in the CreateParams.
+  bool show_in_shelf_;
+
   // PlzNavigate: this is called when the first navigation is ready to commit.
   base::Closure on_first_commit_callback_;