Chromium Code Reviews| 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 52c9034ad52ca0f1e4d6b1c56cf4a9945112a3a0..86929805bfde1d7b753a83ef540159278854195c 100644 |
| --- a/extensions/browser/app_window/app_window.h |
| +++ b/extensions/browser/app_window/app_window.h |
| @@ -191,6 +191,11 @@ 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 have its own shelf icon. Otherwise the window |
| + // will be grouped in the shelf with other windows that are associated with |
| + // the 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; |
| @@ -359,15 +364,15 @@ class AppWindow : public content::WebContentsDelegate, |
| // unblock resource requests. |
| void NotifyRenderViewReady(); |
| - // Whether the app window wants to be alpha enabled. |
|
Reilly Grant (use Gerrit)
2016/07/06 19:53:00
Don't delete these comments as they're unrelated t
stevenjb
2016/07/07 22:55:54
I may have requested that for consistency. These v
Andra Paraschiv
2016/07/08 07:20:27
Yes, Steven, you are right regarding the request.
|
| bool requested_alpha_enabled() const { return requested_alpha_enabled_; } |
| - // Whether the app window is created by IME extensions. |
| // TODO(bshe): rename to hide_app_window_in_launcher if it is not used |
| // anywhere other than app_window_launcher_controller after M45. Otherwise, |
| // remove this TODO. |
| bool is_ime_window() const { return is_ime_window_; } |
| + bool show_in_shelf() const { return show_in_shelf_; } |
| + |
| void SetAppWindowContentsForTesting( |
| std::unique_ptr<AppWindowContents> contents) { |
| app_window_contents_ = std::move(contents); |
| @@ -570,6 +575,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_; |