| 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 264 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 275 | 275 |
| 276 // Windows cannot be always-on-top in fullscreen mode for security reasons. | 276 // Windows cannot be always-on-top in fullscreen mode for security reasons. |
| 277 cached_always_on_top_ = new_params.always_on_top; | 277 cached_always_on_top_ = new_params.always_on_top; |
| 278 if (new_params.state == ui::SHOW_STATE_FULLSCREEN) | 278 if (new_params.state == ui::SHOW_STATE_FULLSCREEN) |
| 279 new_params.always_on_top = false; | 279 new_params.always_on_top = false; |
| 280 | 280 |
| 281 requested_alpha_enabled_ = new_params.alpha_enabled; | 281 requested_alpha_enabled_ = new_params.alpha_enabled; |
| 282 | 282 |
| 283 AppWindowClient* app_window_client = AppWindowClient::Get(); | 283 AppWindowClient* app_window_client = AppWindowClient::Get(); |
| 284 native_app_window_.reset( | 284 native_app_window_.reset( |
| 285 app_window_client->CreateNativeAppWindow(this, new_params)); | 285 app_window_client->CreateNativeAppWindow(this, &new_params)); |
| 286 | 286 |
| 287 helper_.reset(new AppWebContentsHelper( | 287 helper_.reset(new AppWebContentsHelper( |
| 288 browser_context_, extension_id_, web_contents, app_delegate_.get())); | 288 browser_context_, extension_id_, web_contents, app_delegate_.get())); |
| 289 | 289 |
| 290 popup_manager_.reset( | 290 popup_manager_.reset( |
| 291 new web_modal::PopupManager(GetWebContentsModalDialogHost())); | 291 new web_modal::PopupManager(GetWebContentsModalDialogHost())); |
| 292 popup_manager_->RegisterWith(web_contents); | 292 popup_manager_->RegisterWith(web_contents); |
| 293 | 293 |
| 294 UpdateExtensionAppIcon(); | 294 UpdateExtensionAppIcon(); |
| 295 AppWindowRegistry::Get(browser_context_)->AddAppWindow(this); | 295 AppWindowRegistry::Get(browser_context_)->AddAppWindow(this); |
| (...skipping 792 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1088 region.bounds.x(), | 1088 region.bounds.x(), |
| 1089 region.bounds.y(), | 1089 region.bounds.y(), |
| 1090 region.bounds.right(), | 1090 region.bounds.right(), |
| 1091 region.bounds.bottom(), | 1091 region.bounds.bottom(), |
| 1092 region.draggable ? SkRegion::kUnion_Op : SkRegion::kDifference_Op); | 1092 region.draggable ? SkRegion::kUnion_Op : SkRegion::kDifference_Op); |
| 1093 } | 1093 } |
| 1094 return sk_region; | 1094 return sk_region; |
| 1095 } | 1095 } |
| 1096 | 1096 |
| 1097 } // namespace extensions | 1097 } // namespace extensions |
| OLD | NEW |