Don't try to re-layout shelf if the widget has already been deleted.

Don't try to re-layout shelf if the widget has already been deleted.
 Shelf widget's ownership is WIDGET_OWNS_NATIVE_WIDGET, and native view can be NULL when re-layouing due to activation change after deletion.

BUG=230869
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=195070

[oshima, 2013-04-18 17:23:43]

I couldn't find repro step but I think SetState is called after widget is
deleted.

[Harry McCleave, 2013-04-18 20:36:51]

On 2013/04/18 17:23:43, oshima wrote:
> I couldn't find repro step but I think SetState is called after widget is
> deleted.

LGTM

[oshima, 2013-04-18 20:44:59]

derat -> OWNERS review

[Daniel Erat, 2013-04-18 20:59:03]

lgtm

[commit-bot: I haz the power, 2013-04-18 21:06:37]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/oshima@chromium.org/14076009/2001

[commit-bot: I haz the power, 2013-04-18 21:06:38]

Failed to apply patch for ash/shelf/shelf_layout_manager.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file ash/shelf/shelf_layout_manager.cc
  Hunk #2 FAILED at 512.
  1 out of 2 hunks FAILED -- saving rejects to file
ash/shelf/shelf_layout_manager.cc.rej

Patch:       ash/shelf/shelf_layout_manager.cc
Index: ash/shelf/shelf_layout_manager.cc
diff --git a/ash/shelf/shelf_layout_manager.cc
b/ash/shelf/shelf_layout_manager.cc
index
b26f52409abd600500d1898d3a4a2943bb171121..1410e0aa28ec89f0bade182caa434b8761fcddb1
100644
--- a/ash/shelf/shelf_layout_manager.cc
+++ b/ash/shelf/shelf_layout_manager.cc
@@ -204,8 +204,6 @@ bool ShelfLayoutManager::SetAlignment(ShelfAlignment
alignment) {
 }
 
 gfx::Rect ShelfLayoutManager::GetIdealBounds() {
-  // TODO(oshima): this is wrong. Figure out what display shelf is on
-  // and everything should be based on it.
   gfx::Rect bounds(
       ScreenAsh::GetDisplayBoundsInParent(shelf_->GetNativeView()));
   int width = 0, height = 0;
@@ -514,6 +512,9 @@ ShelfLayoutManager::TargetBounds::TargetBounds() :
opacity(0.0f) {}
 ShelfLayoutManager::TargetBounds::~TargetBounds() {}
 
 void ShelfLayoutManager::SetState(ShelfVisibilityState visibility_state) {
+  if (!shelf_->GetNativeView())
+    return;
+
   ShellDelegate* delegate = Shell::GetInstance()->delegate();
   State state;
   state.visibility_state = visibility_state;

[commit-bot: I haz the power, 2013-04-18 21:21:40]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/oshima@chromium.org/14076009/10001

[commit-bot: I haz the power, 2013-04-19 03:29:37]

Change committed as 195070