Two changes to extension app icons:...

chrome/browser/views/tabs/dragged_tab_controller.cc

 // Copyright (c) 2010 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/views/tabs/dragged_tab_controller.h"
 
 #include <math.h>
 #include <set>
 
 #include "app/animation.h"
 #include "app/slide_animation.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/callback.h"
 #include "base/i18n/rtl.h"
 #include "base/keyboard_codes.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/extensions/extension_function_dispatcher.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/views/frame/browser_view.h"
 #include "chrome/browser/views/tabs/dragged_tab_view.h"
 #include "chrome/browser/views/tabs/native_view_photobooth.h"
 #include "chrome/browser/views/tabs/tab.h"
 #include "chrome/browser/views/tabs/tab_strip.h"
-#include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/notification_service.h"
 #include "gfx/canvas.h"
 #include "grit/theme_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "views/event.h"
 #include "views/widget/root_view.h"
 #include "views/widget/widget.h"
 #include "views/window/window.h"
 
 #if defined(OS_WIN)
 #include "views/widget/widget_win.h"
 #endif
 
 #if defined(OS_LINUX)
 #include <gdk/gdk.h>
 #include <gdk/gdkkeysyms.h>
 #endif
 
-static const int kHorizontalMoveThreshold = 16; // pixels
+static const int kHorizontalMoveThreshold = 16;  // Pixels.
 
 namespace {
 
 // Delay, in ms, during dragging before we bring a window to front.
 const int kBringToFrontDelay = 750;
 
 // Radius of the rect drawn by DockView.
 const int kRoundedRectRadius = 4;
 
 // Spacing between tab icons when DockView is showing a docking location that
@@ skipping 275 matching lines @@
 
 DraggedTabController::~DraggedTabController() {
   in_destructor_ = true;
   CleanUpSourceTab();
   MessageLoopForUI::current()->RemoveObserver(this);
   // Need to delete the view here manually _before_ we reset the dragged
   // contents to NULL, otherwise if the view is animating to its destination
   // bounds, it won't be able to clean up properly since its cleanup routine
   // uses GetIndexForDraggedContents, which will be invalid.
   view_.reset(NULL);
-  SetDraggedContents(NULL); // This removes our observer.
+  SetDraggedContents(NULL);  // This removes our observer.
 }
 
 void DraggedTabController::CaptureDragInfo(const gfx::Point& mouse_offset) {
   start_screen_point_ = GetCursorScreenPoint();
   mouse_offset_ = mouse_offset;
   InitWindowCreatePoint();
 }
 
 void DraggedTabController::Drag() {
   bring_to_front_timer_.Stop();
@@ skipping 406 matching lines @@
   // Update the View first, so we can ask it for its bounds and determine
   // where to insert the hidden Tab.
 
   // If this is the first time Attach is called for this drag, we're attaching
   // to the source TabStrip, and we should assume the tab count already
   // includes this Tab since we haven't been detached yet. If we don't do this,
   // the dragged representation will be a different size to others in the
   // TabStrip.
   int tab_count = attached_tabstrip_->GetTabCount();
   int mini_tab_count = attached_tabstrip_->GetMiniTabCount();
+  int nano_tab_count = attached_tabstrip_->GetNanoTabCount();
   if (!tab)
     ++tab_count;
   double unselected_width, selected_width = 0;
   attached_tabstrip_->GetDesiredTabWidths(tab_count, mini_tab_count,
-                                          &unselected_width, &selected_width);
+                                          nano_tab_count, &unselected_width,
+                                          &selected_width);
   EnsureDraggedView();
   int dragged_tab_width =
       mini_ ? Tab::GetMiniWidth() : static_cast<int>(selected_width);
   view_->Attach(dragged_tab_width);
 
   if (!tab) {
     // There is no Tab in |attached_tabstrip| that corresponds to the dragged
     // TabContents. We must now create one.
 
     // Remove ourselves as the delegate now that the dragged TabContents is
@@ skipping 18 matching lines @@
     // representation and the ideal bounds of the other Tabs already in the
     // strip. ("ideal bounds" are stable even if the Tabs' actual bounds are
     // changing due to animation).
     gfx::Rect bounds = GetDraggedViewTabStripBounds(screen_point);
     int index = GetInsertionIndexForDraggedBounds(bounds, false);
     attached_tabstrip_->model()->InsertTabContentsAt(index, dragged_contents_,
         true, false, pinned_);
 
     tab = GetTabMatchingDraggedContents(attached_tabstrip_);
   }
-  DCHECK(tab); // We should now have a tab.
+  DCHECK(tab);  // We should now have a tab.
   tab->SetVisible(false);
 
   // Move the corresponding window to the front.
   attached_tabstrip_->GetWindow()->Activate();
 }
 
 void DraggedTabController::Detach() {
   // Prevent the TabContents' HWND from being hidden by any of the model
   // operations performed during the drag.
   dragged_contents_->set_capturing_contents(true);
@@ skipping 465 matching lines @@
 
     // The previous call made the window appear on top of the dragged window,
     // move the dragged window to the front.
     SetWindowPos(view_->GetWidget()->GetNativeView(), HWND_TOP, 0, 0, 0, 0,
                  SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE);
 #else
     NOTIMPLEMENTED();
 #endif
   }
 }