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 424 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
435 delayed_show_type_ == SHOW_INACTIVE); | 435 delayed_show_type_ == SHOW_INACTIVE); |
436 Show(delayed_show_type_); | 436 Show(delayed_show_type_); |
437 } | 437 } |
438 } | 438 } |
439 | 439 |
440 void AppWindow::OnNativeClose() { | 440 void AppWindow::OnNativeClose() { |
441 AppWindowRegistry::Get(browser_context_)->RemoveAppWindow(this); | 441 AppWindowRegistry::Get(browser_context_)->RemoveAppWindow(this); |
442 if (app_window_contents_) { | 442 if (app_window_contents_) { |
443 WebContents* web_contents = app_window_contents_->GetWebContents(); | 443 WebContents* web_contents = app_window_contents_->GetWebContents(); |
444 WebContentsModalDialogManager::FromWebContents(web_contents) | 444 WebContentsModalDialogManager::FromWebContents(web_contents) |
445 ->SetDelegate(NULL); | 445 ->SetDelegate(nullptr); |
446 app_window_contents_->NativeWindowClosed(); | 446 app_window_contents_->NativeWindowClosed(); |
447 } | 447 } |
448 delete this; | 448 delete this; |
449 } | 449 } |
450 | 450 |
451 void AppWindow::OnNativeWindowChanged() { | 451 void AppWindow::OnNativeWindowChanged() { |
452 SaveWindowPosition(); | 452 SaveWindowPosition(); |
453 | 453 |
454 #if defined(OS_WIN) | 454 #if defined(OS_WIN) |
455 if (native_app_window_ && cached_always_on_top_ && !IsFullscreen() && | 455 if (native_app_window_ && cached_always_on_top_ && !IsFullscreen() && |
(...skipping 610 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1066 region.bounds.x(), | 1066 region.bounds.x(), |
1067 region.bounds.y(), | 1067 region.bounds.y(), |
1068 region.bounds.right(), | 1068 region.bounds.right(), |
1069 region.bounds.bottom(), | 1069 region.bounds.bottom(), |
1070 region.draggable ? SkRegion::kUnion_Op : SkRegion::kDifference_Op); | 1070 region.draggable ? SkRegion::kUnion_Op : SkRegion::kDifference_Op); |
1071 } | 1071 } |
1072 return sk_region; | 1072 return sk_region; |
1073 } | 1073 } |
1074 | 1074 |
1075 } // namespace extensions | 1075 } // namespace extensions |
OLD | NEW |