OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "apps/app_window.h" | 5 #include "apps/app_window.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "apps/app_window_geometry_cache.h" | 9 #include "apps/app_window_geometry_cache.h" |
10 #include "apps/app_window_registry.h" | 10 #include "apps/app_window_registry.h" |
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
150 void AppWindow::BoundsSpecification::ResetBounds() { | 150 void AppWindow::BoundsSpecification::ResetBounds() { |
151 bounds.SetRect(kUnspecifiedPosition, kUnspecifiedPosition, 0, 0); | 151 bounds.SetRect(kUnspecifiedPosition, kUnspecifiedPosition, 0, 0); |
152 } | 152 } |
153 | 153 |
154 // AppWindow::CreateParams | 154 // AppWindow::CreateParams |
155 | 155 |
156 AppWindow::CreateParams::CreateParams() | 156 AppWindow::CreateParams::CreateParams() |
157 : window_type(AppWindow::WINDOW_TYPE_DEFAULT), | 157 : window_type(AppWindow::WINDOW_TYPE_DEFAULT), |
158 frame(AppWindow::FRAME_CHROME), | 158 frame(AppWindow::FRAME_CHROME), |
159 has_frame_color(false), | 159 has_frame_color(false), |
| 160 active_frame_color(SK_ColorBLACK), |
| 161 inactive_frame_color(SK_ColorBLACK), |
160 transparent_background(false), | 162 transparent_background(false), |
161 creator_process_id(0), | 163 creator_process_id(0), |
162 state(ui::SHOW_STATE_DEFAULT), | 164 state(ui::SHOW_STATE_DEFAULT), |
163 hidden(false), | 165 hidden(false), |
164 resizable(true), | 166 resizable(true), |
165 focused(true), | 167 focused(true), |
166 always_on_top(false) {} | 168 always_on_top(false) {} |
167 | 169 |
168 AppWindow::CreateParams::~CreateParams() {} | 170 AppWindow::CreateParams::~CreateParams() {} |
169 | 171 |
(...skipping 970 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1140 region.bounds.x(), | 1142 region.bounds.x(), |
1141 region.bounds.y(), | 1143 region.bounds.y(), |
1142 region.bounds.right(), | 1144 region.bounds.right(), |
1143 region.bounds.bottom(), | 1145 region.bounds.bottom(), |
1144 region.draggable ? SkRegion::kUnion_Op : SkRegion::kDifference_Op); | 1146 region.draggable ? SkRegion::kUnion_Op : SkRegion::kDifference_Op); |
1145 } | 1147 } |
1146 return sk_region; | 1148 return sk_region; |
1147 } | 1149 } |
1148 | 1150 |
1149 } // namespace apps | 1151 } // namespace apps |
OLD | NEW |