Cleanup: Remove ViewProp from aura build

chrome/browser/ui/views/frame/browser_view.cc

Index: chrome/browser/ui/views/frame/browser_view.cc
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc
index 81a46840be9a1c492393a3443b89f3e63d4fbcc2..eb3cca4bf167495605030841198a509898fd8c9a 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -111,7 +111,6 @@
 #include "ui/aura_shell/launcher/launcher.h"
 #include "ui/aura_shell/launcher/launcher_model.h"
 #include "ui/aura_shell/shell.h"
-#include "ui/base/view_prop.h"
 #elif defined(OS_WIN)
 #include "chrome/browser/aeropeek_manager.h"
 #include "chrome/browser/jumplist_win.h"
@@ -132,10 +131,6 @@
 #include "chrome/browser/ui/views/download/download_shelf_view.h"
 #endif
 
-#if defined(OS_WIN) && !defined(USE_AURA)
-#include "ui/base/view_prop.h"
-#endif
-
 #if defined(TOUCH_UI)
 #include "chrome/browser/ui/touch/status_bubble_touch.h"
 #endif
@@ -382,8 +377,10 @@ BrowserView::~BrowserView() {
 // static
 BrowserView* BrowserView::GetBrowserViewForNativeWindow(
     gfx::NativeWindow window) {
+  views::Widget* widget = views::Widget::GetWidgetForNativeWindow(window);

[sky, 2011/11/01 14:54:40]

It's entirely possible widget is NULL here.

[oshima, 2011/11/01 15:36:56]

Done.

+  DCHECK(widget);
   return reinterpret_cast<BrowserView*>(
-      ui::ViewProp::GetValue(window, kBrowserViewKey));
+      widget->GetNativeWindowProperty(kBrowserViewKey));
 }
 #endif