Improve large tab strip by leveraging touch icons when present

chrome/browser/ui/views/tabs/browser_tab_strip_controller.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/tabs/browser_tab_strip_controller.h"
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
 #include "chrome/browser/extensions/extension_tab_helper.h"
 #include "chrome/browser/favicon/favicon_tab_helper.h"
@@ skipping 310 matching lines @@
                                               int model_index,
                                               bool active) {
   DCHECK(contents);
   DCHECK(model_index == TabStripModel::kNoTab ||
          model_->ContainsIndex(model_index));
 
   // Cancel any pending tab transition.
   hover_tab_selector_.CancelTabTransition();
 
   TabRendererData data;
-  SetTabRendererDataFromModel(contents->tab_contents(), model_index, &data);
+  SetTabRendererDataFromModel(contents->tab_contents(), model_index, &data,
+      true);

[sky, 2011/06/16 15:43:41]

align with ( on 331.

[Emmanuel Saint-loubert-Bié, 2011/06/17 00:01:44]

OK I agree this is probably more readable. Here is what our coding guidelines
say, and I find this a bit confusing:

When calling a function, however, feel free to collapse things to take less
space.  Do whatever seems most readable.
     ThisIsARatherLongFunctionCall(
    first_lengthy_argument, second_argument, yet_another,
    more_arguments_here, okay_thats_enough);

ThisIsAnotherLongFunctionCall(first_lengthy_argument,
                              second_argument, yet_another);

AndAnotherLongFunctionCall(first_lengthy_argument,
    second_argument, yet_another);

AnotherLongFunctionCall(
    first_lengthy_argument,
    second_argument, yet_another);

bool result =
    YetAnotherLongFunctionCall(first_argument, second_argument);

   tabstrip_->AddTabAt(model_index, data);
 }
 
 void BrowserTabStripController::TabDetachedAt(TabContentsWrapper* contents,
                                               int model_index) {
   // Cancel any pending tab transition.
   hover_tab_selector_.CancelTabTransition();
 
   tabstrip_->RemoveTabAt(model_index);
 }
 
 void BrowserTabStripController::ActiveTabChanged(
     TabContentsWrapper* old_contents,
     TabContentsWrapper* contents,
     int model_index,
     bool user_gesture) {
   tabstrip_->SelectTabAt(model_->GetIndexOfTabContents(old_contents),
                          model_index);
 }
 
 void BrowserTabStripController::TabMoved(TabContentsWrapper* contents,
                                          int from_model_index,
                                          int to_model_index) {
   // Cancel any pending tab transition.
   hover_tab_selector_.CancelTabTransition();
 
   // Update the data first as the pinned state may have changed.
   TabRendererData data;
-  SetTabRendererDataFromModel(contents->tab_contents(), to_model_index, &data);
+  SetTabRendererDataFromModel(contents->tab_contents(), to_model_index, &data,
+      false);

[sky, 2011/06/16 15:43:41]

nit: align with ( on 361

[Emmanuel Saint-loubert-Bié, 2011/06/17 00:01:44]

Done.

   tabstrip_->SetTabData(from_model_index, data);
 
   tabstrip_->MoveTab(from_model_index, to_model_index);
 }
 
 void BrowserTabStripController::TabChangedAt(TabContentsWrapper* contents,
                                              int model_index,
                                              TabChangeType change_type) {
   if (change_type == TITLE_NOT_LOADING) {
     tabstrip_->TabTitleChangedNotLoading(model_index);
@@ skipping 26 matching lines @@
 void BrowserTabStripController::TabBlockedStateChanged(
     TabContentsWrapper* contents,
     int model_index) {
   SetTabDataAt(contents, model_index);
 }
 
 void BrowserTabStripController::SetTabDataAt(
     TabContentsWrapper* contents,
     int model_index) {
   TabRendererData data;
-  SetTabRendererDataFromModel(contents->tab_contents(), model_index, &data);
+  SetTabRendererDataFromModel(contents->tab_contents(), model_index, &data,
+      false);

[sky, 2011/06/16 15:43:41]

nit: align with ( on 409.

   tabstrip_->SetTabData(model_index, data);
 }
 
 void BrowserTabStripController::SetTabRendererDataFromModel(
     TabContents* contents,
     int model_index,
-    TabRendererData* data) {
+    TabRendererData* data,
+    bool new_tab_insertion) {
   SkBitmap* app_icon = NULL;
   TabContentsWrapper* wrapper =
       TabContentsWrapper::GetCurrentWrapperForContents(contents);
 
   // Extension App icons are slightly larger than favicons, so only allow
   // them if permitted by the model.
   if (model_->delegate()->LargeIconsPermitted())
     app_icon = wrapper->extension_tab_helper()->GetExtensionAppIcon();
 
   if (app_icon)
@@ skipping 47 matching lines @@
   DCHECK(type.value == NotificationType::TAB_CLOSEABLE_STATE_CHANGED);
   // Note that this notification may be fired during a model mutation and
   // possibly before the tabstrip has processed the change.
   // Here, we just re-layout each existing tab to reflect the change in its
   // closeable state, and then schedule paint for entire tabstrip.
   for (int i = 0; i < tabstrip_->tab_count(); ++i) {
     tabstrip_->base_tab_at_tab_index(i)->Layout();
   }
   tabstrip_->SchedulePaint();
 }