diff options
| author | varkha <varkha@chromium.org> | 2015-05-05 11:12:31 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-05-05 18:13:09 +0000 |
| commit | 74014e0e926e2170188c9d7cc4706ccba36448c9 (patch) | |
| tree | 1675abdf89ce226c93b6cf249eba29f7ff106b7e /ui | |
| parent | e28d513833e8084b1036af9cbc076541d3d9db62 (diff) | |
| download | chromium_src-74014e0e926e2170188c9d7cc4706ccba36448c9.zip chromium_src-74014e0e926e2170188c9d7cc4706ccba36448c9.tar.gz chromium_src-74014e0e926e2170188c9d7cc4706ccba36448c9.tar.bz2 | |
[Docking] Persists docked state for chrome app and extension windows on Chrome OS. Browser windows should not be affected - the browser will start normal or maximized but never initially docked.
BUG=271582
Review URL: https://codereview.chromium.org/1056793006
Cr-Commit-Position: refs/heads/master@{#328356}
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/base/ui_base_types.h | 3 | ||||
| -rw-r--r-- | ui/views/widget/native_widget_mac.mm | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/ui/base/ui_base_types.h b/ui/base/ui_base_types.h index b40815a..4ed9f25 100644 --- a/ui/base/ui_base_types.h +++ b/ui/base/ui_base_types.h @@ -20,7 +20,8 @@ enum WindowShowState { SHOW_STATE_MAXIMIZED = 3, SHOW_STATE_INACTIVE = 4, // Views only, not persisted. SHOW_STATE_FULLSCREEN = 5, - SHOW_STATE_END = 6 // The end of show state enum. + SHOW_STATE_DOCKED = 6, + SHOW_STATE_END = 7 // The end of show state enum. }; // Dialog button identifiers used to specify which buttons to show the user. diff --git a/ui/views/widget/native_widget_mac.mm b/ui/views/widget/native_widget_mac.mm index ca8fcb6..10a1c9f 100644 --- a/ui/views/widget/native_widget_mac.mm +++ b/ui/views/widget/native_widget_mac.mm @@ -345,6 +345,7 @@ void NativeWidgetMac::ShowWithWindowState(ui::WindowShowState state) { case ui::SHOW_STATE_MINIMIZED: case ui::SHOW_STATE_MAXIMIZED: case ui::SHOW_STATE_FULLSCREEN: + case ui::SHOW_STATE_DOCKED: NOTIMPLEMENTED(); break; case ui::SHOW_STATE_END: |