Wires keeping the launcher up to date with the browser.

views/widget/native_widget_aura.h

Index: views/widget/native_widget_aura.h
diff --git a/views/widget/native_widget_aura.h b/views/widget/native_widget_aura.h
index 23bb405a871c5708969d80dda55b62791fb5f1f4..a21637b107632a8c1728cc25548b3a1669086e49 100644
--- a/views/widget/native_widget_aura.h
+++ b/views/widget/native_widget_aura.h
@@ -6,8 +6,7 @@
 #define VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_
 #pragma once
 
-#include <map>
-
+#include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
 #include "ui/aura/window_delegate.h"
 #include "views/views_export.h"
@@ -20,6 +19,10 @@ namespace gfx {
 class Font;
 }
 
+namespace ui {
+class ViewProp;
+}
+
 namespace views {
 
 class VIEWS_EXPORT NativeWidgetAura : public internal::NativeWidgetPrivate,
@@ -138,7 +141,7 @@ class VIEWS_EXPORT NativeWidgetAura : public internal::NativeWidgetPrivate,
   virtual void OnWindowVisibilityChanged(bool visible) OVERRIDE;
 
  private:
-  typedef std::map<const char*, void*> PropsMap;
+  typedef ScopedVector<ui::ViewProp> ViewProps;
 
   internal::NativeWidgetDelegate* delegate_;
 
@@ -153,11 +156,10 @@ class VIEWS_EXPORT NativeWidgetAura : public internal::NativeWidgetPrivate,
 
   bool can_activate_;
 
-  // Map used by Set/GetNativeWindowProperty.
-  PropsMap props_map_;
-
   gfx::NativeCursor cursor_;
 
+  ViewProps props_;
+
   DISALLOW_COPY_AND_ASSIGN(NativeWidgetAura);
 };