Wires keeping the launcher up to date with the browser.

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 2279d184caef18319c3014525bef0dc75c95d44c..c3b37716c6b9f6f97182bcad62cf1771f39b2f9e 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -105,11 +105,15 @@
 #include "views/window/dialog_delegate.h"
 
 #if defined(USE_AURA)
+#include "chrome/browser/ui/aura/launcher_icon_updater.h"
+#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"
 #include "ui/base/message_box_win.h"
-#include "ui/base/view_prop.h"
 #include "views/widget/native_widget_win.h"
 #elif defined(TOOLKIT_USES_GTK)
 #include "chrome/browser/ui/views/accelerator_table_linux.h"
@@ -125,6 +129,10 @@
 #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
@@ -366,13 +374,12 @@ BrowserView::~BrowserView() {
   browser_.reset();
 }
 
-// Tab dragging code on windows needs this.
-#if defined(OS_WIN) && !defined(USE_AURA)
+#if defined(OS_WIN) || defined(USE_AURA)
 // static
 BrowserView* BrowserView::GetBrowserViewForNativeWindow(
     gfx::NativeWindow window) {
-  return IsWindow(window) ? reinterpret_cast<BrowserView*>(
-      ui::ViewProp::GetValue(window, kBrowserViewKey)) : NULL;
+  return reinterpret_cast<BrowserView*>(
+      ui::ViewProp::GetValue(window, kBrowserViewKey));
 }
 #endif
 
@@ -1907,6 +1914,13 @@ void BrowserView::Init() {
 
   // We're now initialized and ready to process Layout requests.
   ignore_layout_ = false;
+
+#if defined(USE_AURA)
+  icon_updater_.reset(new LauncherIconUpdater(
+      browser_->tabstrip_model(),
+      aura_shell::Shell::GetInstance()->launcher()->model(),
+      frame_->GetNativeWindow()));
+#endif
 }
 
 void BrowserView::LoadingAnimationCallback() {