diff options
| author | benwells@chromium.org <benwells@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-21 14:30:25 +0000 |
|---|---|---|
| committer | benwells@chromium.org <benwells@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-21 14:30:25 +0000 |
| commit | 7cccda1dbff37f3740ca5c5e06e4898db83e7722 (patch) | |
| tree | 6bccd830ba0fc3f2fdf395fff1e2b0e44d19fb6d /apps/app_window.cc | |
| parent | 81f89e978e8d99c44027be184e48d3c86a498e4b (diff) | |
| download | chromium_src-7cccda1dbff37f3740ca5c5e06e4898db83e7722.zip chromium_src-7cccda1dbff37f3740ca5c5e06e4898db83e7722.tar.gz chromium_src-7cccda1dbff37f3740ca5c5e06e4898db83e7722.tar.bz2 | |
Add frame color option to packaged app windows.
If app windows are created with a frame color option, that color is used
for the frame. If no color is supplied a native style look is used
instead. This is currently implemented on linux aura and windows only.
This change also removes the --apps-use-native-frame flag on windows.
BUG=339558
Review URL: https://codereview.chromium.org/166443004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@252548 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'apps/app_window.cc')
| -rw-r--r-- | apps/app_window.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/apps/app_window.cc b/apps/app_window.cc index 99198b0..1f0c945 100644 --- a/apps/app_window.cc +++ b/apps/app_window.cc @@ -123,6 +123,7 @@ void AppWindow::SizeConstraints::set_maximum_size(const gfx::Size& max_size) { AppWindow::CreateParams::CreateParams() : window_type(AppWindow::WINDOW_TYPE_DEFAULT), frame(AppWindow::FRAME_CHROME), + has_frame_color(false), transparent_background(false), bounds(INT_MIN, INT_MIN, 0, 0), creator_process_id(0), @@ -610,6 +611,8 @@ void AppWindow::GetSerializedState(base::DictionaryValue* properties) const { boundsValue->SetInteger("width", bounds.width()); boundsValue->SetInteger("height", bounds.height()); properties->Set("bounds", boundsValue.release()); + properties->SetBoolean("hasFrameColor", native_app_window_->HasFrameColor()); + properties->SetInteger("frameColor", native_app_window_->FrameColor()); const SizeConstraints& constraints = size_constraints(); gfx::Size min_size = constraints.GetMinimumSize(); |