OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "chrome/browser/ui/extensions/shell_window.h" | 5 #include "chrome/browser/ui/extensions/shell_window.h" |
6 | 6 |
7 #include "base/utf_string_conversions.h" | 7 #include "base/utf_string_conversions.h" |
8 #include "base/values.h" | 8 #include "base/values.h" |
9 #include "chrome/browser/extensions/extension_process_manager.h" | 9 #include "chrome/browser/extensions/extension_process_manager.h" |
10 #include "chrome/browser/extensions/extension_system.h" | 10 #include "chrome/browser/extensions/extension_system.h" |
(...skipping 555 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
566 // TODO(jianli): once http://crbug.com/123007 is fixed, we'll no longer | 566 // TODO(jianli): once http://crbug.com/123007 is fixed, we'll no longer |
567 // need to make the native window (ShellWindowViews specially) update | 567 // need to make the native window (ShellWindowViews specially) update |
568 // the clickthrough region for the new RVH. | 568 // the clickthrough region for the new RVH. |
569 native_app_window_->RenderViewHostChanged(); | 569 native_app_window_->RenderViewHostChanged(); |
570 break; | 570 break; |
571 } | 571 } |
572 case chrome::NOTIFICATION_EXTENSION_UNLOADED: { | 572 case chrome::NOTIFICATION_EXTENSION_UNLOADED: { |
573 const extensions::Extension* unloaded_extension = | 573 const extensions::Extension* unloaded_extension = |
574 content::Details<extensions::UnloadedExtensionInfo>( | 574 content::Details<extensions::UnloadedExtensionInfo>( |
575 details)->extension; | 575 details)->extension; |
576 if (extension_ == unloaded_extension) | 576 if (extension_ == unloaded_extension) { |
benwells
2013/02/10 23:19:36
Are there other cases where we should remove the w
jeremya
2013/02/10 23:58:44
Yep, good catch. Fixed.
| |
577 native_app_window_->Close(); | 577 native_app_window_->Close(); |
578 extensions::ShellWindowRegistry::Get(profile_)->RemoveShellWindow(this); | |
579 } | |
578 break; | 580 break; |
579 } | 581 } |
580 case chrome::NOTIFICATION_APP_TERMINATING: | 582 case chrome::NOTIFICATION_APP_TERMINATING: |
581 native_app_window_->Close(); | 583 native_app_window_->Close(); |
582 break; | 584 break; |
583 default: | 585 default: |
584 NOTREACHED() << "Received unexpected notification"; | 586 NOTREACHED() << "Received unexpected notification"; |
585 } | 587 } |
586 } | 588 } |
587 | 589 |
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
636 const extensions::DraggableRegion& region = *iter; | 638 const extensions::DraggableRegion& region = *iter; |
637 sk_region->op( | 639 sk_region->op( |
638 region.bounds.x(), | 640 region.bounds.x(), |
639 region.bounds.y(), | 641 region.bounds.y(), |
640 region.bounds.right(), | 642 region.bounds.right(), |
641 region.bounds.bottom(), | 643 region.bounds.bottom(), |
642 region.draggable ? SkRegion::kUnion_Op : SkRegion::kDifference_Op); | 644 region.draggable ? SkRegion::kUnion_Op : SkRegion::kDifference_Op); |
643 } | 645 } |
644 return sk_region; | 646 return sk_region; |
645 } | 647 } |
OLD | NEW |