Wires keeping the launcher up to date with the browser.

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

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/frame/browser_view.h"
 
 #if defined(TOOLKIT_USES_GTK)
 #include <gtk/gtk.h>
 #endif
 
@@ skipping 87 matching lines @@
 #include "views/events/event.h"
 #include "views/focus/external_focus_tracker.h"
 #include "views/focus/view_storage.h"
 #include "views/layout/grid_layout.h"
 #include "views/widget/native_widget.h"
 #include "views/widget/root_view.h"
 #include "views/widget/widget.h"
 #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"
 #include "views/window/hit_test.h"
 #if !defined(TOUCH_UI)
 #include "chrome/browser/ui/views/handle_web_keyboard_event.h"
 #endif
 #endif
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/ui/views/keyboard_overlay_dialog_view.h"
 #else
 #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
 
 using base::TimeDelta;
 using views::ColumnSet;
 using views::GridLayout;
 
 // The height of the status bubble.
 static const int kStatusBubbleHeight = 20;
@@ skipping 221 matching lines @@
     delete tabstrip_;
     tabstrip_ = NULL;
   }
   // Child views maintain PrefMember attributes that point to
   // OffTheRecordProfile's PrefService which gets deleted by ~Browser.
   RemoveAllChildViews(true);
   // Explicitly set browser_ to NULL.
   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
 
 // static
 BrowserView* BrowserView::GetBrowserViewForBrowser(Browser* browser) {
   return static_cast<BrowserView*>(browser->window());
 }
 
 gfx::Rect BrowserView::GetToolbarBounds() const {
   gfx::Rect toolbar_bounds(toolbar_->bounds());
@@ skipping 1514 matching lines @@
 
   if (AeroPeekManager::Enabled()) {
     aeropeek_manager_.reset(new AeroPeekManager(
         frame_->GetNativeWindow()));
     browser_->tabstrip_model()->AddObserver(aeropeek_manager_.get());
   }
 #endif
 
   // 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() {
   base::TimeTicks now = base::TimeTicks::Now();
   if (!last_animation_time_.is_null()) {
     UMA_HISTOGRAM_TIMES(
         "Tabs.LoadingAnimationTime",
         now - last_animation_time_);
   }
   last_animation_time_ = now;
@@ skipping 635 matching lines @@
   views::View::ConvertPointToScreen(GetTabContentsContainerView(), &origin);
   gfx::Rect bounds;
   bounds.set_origin(origin);
 
   AvatarMenuBubbleView* bubble_view = new AvatarMenuBubbleView(browser_.get());
   // Bubble::Show() takes ownership of the view.
   Bubble::Show(this->GetWidget(), bounds,
                views::BubbleBorder::TOP_RIGHT,
                bubble_view, bubble_view);
 }