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 "extensions/browser/app_window/app_window.h" | 5 #include "extensions/browser/app_window/app_window.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <string> | 8 #include <string> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
220 | 220 |
221 gfx::Size AppWindow::CreateParams::GetWindowMaximumSize( | 221 gfx::Size AppWindow::CreateParams::GetWindowMaximumSize( |
222 const gfx::Insets& frame_insets) const { | 222 const gfx::Insets& frame_insets) const { |
223 return GetCombinedWindowConstraints(window_spec.maximum_size, | 223 return GetCombinedWindowConstraints(window_spec.maximum_size, |
224 content_spec.maximum_size, | 224 content_spec.maximum_size, |
225 frame_insets); | 225 frame_insets); |
226 } | 226 } |
227 | 227 |
228 // AppWindow | 228 // AppWindow |
229 | 229 |
230 AppWindow::AppWindow(BrowserContext* context, | 230 AppWindow::AppWindow(BrowserContext *context, AppDelegate *app_delegate, |
not at google - send to devlin
2014/11/20 15:30:30
Same?
MRV
2014/11/21 11:12:39
I'll change as original style.
| |
231 AppDelegate* app_delegate, | 231 const Extension *extension) |
232 const Extension* extension) | 232 : browser_context_(context), extension_id_(extension->id()), |
233 : browser_context_(context), | 233 window_type_(WINDOW_TYPE_DEFAULT), app_delegate_(app_delegate), |
234 extension_id_(extension->id()), | 234 fullscreen_types_(FULLSCREEN_TYPE_NONE), show_on_first_paint_(false), |
235 window_type_(WINDOW_TYPE_DEFAULT), | 235 first_paint_complete_(false), has_been_shown_(false), |
236 app_delegate_(app_delegate), | 236 can_send_events_(false), is_hidden_(false), cached_always_on_top_(false), |
237 image_loader_ptr_factory_(this), | 237 requested_alpha_enabled_(false), image_loader_ptr_factory_(this) { |
238 fullscreen_types_(FULLSCREEN_TYPE_NONE), | |
239 show_on_first_paint_(false), | |
240 first_paint_complete_(false), | |
241 has_been_shown_(false), | |
242 can_send_events_(false), | |
243 is_hidden_(false), | |
244 cached_always_on_top_(false), | |
245 requested_alpha_enabled_(false) { | |
246 ExtensionsBrowserClient* client = ExtensionsBrowserClient::Get(); | 238 ExtensionsBrowserClient* client = ExtensionsBrowserClient::Get(); |
247 CHECK(!client->IsGuestSession(context) || context->IsOffTheRecord()) | 239 CHECK(!client->IsGuestSession(context) || context->IsOffTheRecord()) |
248 << "Only off the record window may be opened in the guest mode."; | 240 << "Only off the record window may be opened in the guest mode."; |
249 } | 241 } |
250 | 242 |
251 void AppWindow::Init(const GURL& url, | 243 void AppWindow::Init(const GURL& url, |
252 AppWindowContents* app_window_contents, | 244 AppWindowContents* app_window_contents, |
253 const CreateParams& params) { | 245 const CreateParams& params) { |
254 // Initialize the render interface and web contents | 246 // Initialize the render interface and web contents |
255 app_window_contents_.reset(app_window_contents); | 247 app_window_contents_.reset(app_window_contents); |
(...skipping 835 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1091 region.bounds.x(), | 1083 region.bounds.x(), |
1092 region.bounds.y(), | 1084 region.bounds.y(), |
1093 region.bounds.right(), | 1085 region.bounds.right(), |
1094 region.bounds.bottom(), | 1086 region.bounds.bottom(), |
1095 region.draggable ? SkRegion::kUnion_Op : SkRegion::kDifference_Op); | 1087 region.draggable ? SkRegion::kUnion_Op : SkRegion::kDifference_Op); |
1096 } | 1088 } |
1097 return sk_region; | 1089 return sk_region; |
1098 } | 1090 } |
1099 | 1091 |
1100 } // namespace extensions | 1092 } // namespace extensions |
OLD | NEW |