Another set of icons for the launcher. The chrome logo now shows the

ui/aura_shell/launcher/launcher_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 "ui/aura_shell/launcher/launcher_view.h"
 
 #include "base/utf_string_conversions.h"
 #include "grit/ui_resources.h"
 #include "ui/aura/window.h"
 #include "ui/aura_shell/launcher/app_launcher_button.h"
@@ skipping 212 matching lines @@
   model_->RemoveObserver(this);
 }
 
 void LauncherView::Init() {
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   model_->AddObserver(this);
 
   set_background(
       views::Background::CreateBackgroundPainter(true, new ShelfPainter()));
 
-  new_browser_button_ = new views::ImageButton(this);
-  ShellDelegate* delegate = Shell::GetInstance()->delegate();
-  int new_browser_button_image_id = delegate ?
-      delegate->GetResourceIDForNewBrowserWindow() :
-      IDR_AURA_LAUNCHER_ICON_CHROME;
-  new_browser_button_->SetImage(
+  show_apps_button_ = new views::ImageButton(this);
+  show_apps_button_->SetImage(
       views::CustomButton::BS_NORMAL,
-      rb.GetImageNamed(new_browser_button_image_id).ToSkBitmap());
-  ConfigureChildView(new_browser_button_);
-  AddChildView(new_browser_button_);
+      rb.GetImageNamed(IDR_AURA_LAUNCHER_ICON_APPLIST).ToSkBitmap());
+  show_apps_button_->SetImage(
+      views::CustomButton::BS_HOT,
+      rb.GetImageNamed(IDR_AURA_LAUNCHER_ICON_APPLIST_HOT).ToSkBitmap());
+  show_apps_button_->SetImage(
+      views::CustomButton::BS_PUSHED,
+      rb.GetImageNamed(IDR_AURA_LAUNCHER_ICON_APPLIST_PUSHED).ToSkBitmap());
+  ConfigureChildView(show_apps_button_);
+  AddChildView(show_apps_button_);
 
   const LauncherItems& items(model_->items());
   for (LauncherItems::const_iterator i = items.begin(); i != items.end(); ++i) {
     views::View* child = CreateViewForItem(*i);
     child->SetPaintToLayer(true);
     view_model_->Add(child, static_cast<int>(i - items.begin()));
     AddChildView(child);
   }
 
-  show_apps_button_ = new views::ImageButton(this);
-  show_apps_button_->SetImage(
+  new_browser_button_ = new views::ImageButton(this);
+  new_browser_button_->SetImage(
       views::CustomButton::BS_NORMAL,
-      rb.GetImageNamed(IDR_AURA_LAUNCHER_ICON_APPLIST).ToSkBitmap());
-  show_apps_button_->SetImage(
+      rb.GetImageNamed(IDR_AURA_LAUNCHER_NEW_BROWSER).ToSkBitmap());
+  new_browser_button_->SetImage(
       views::CustomButton::BS_HOT,
-      rb.GetImageNamed(IDR_AURA_LAUNCHER_ICON_APPLIST_HOT).ToSkBitmap());
-  show_apps_button_->SetImage(
+      rb.GetImageNamed(IDR_AURA_LAUNCHER_NEW_BROWSER_HOT).ToSkBitmap());
+  new_browser_button_->SetImage(
       views::CustomButton::BS_PUSHED,
-      rb.GetImageNamed(IDR_AURA_LAUNCHER_ICON_APPLIST_PUSHED).ToSkBitmap());
-  ConfigureChildView(show_apps_button_);
-  AddChildView(show_apps_button_);
+      rb.GetImageNamed(IDR_AURA_LAUNCHER_NEW_BROWSER_PUSHED).ToSkBitmap());
+  ConfigureChildView(new_browser_button_);
+  AddChildView(new_browser_button_);
 
   overflow_button_ = new views::ImageButton(this);
   overflow_button_->SetImage(
       views::CustomButton::BS_NORMAL,
       rb.GetImageNamed(IDR_AURA_LAUNCHER_OVERFLOW).ToSkBitmap());
   overflow_button_->SetImage(
       views::CustomButton::BS_HOT,
       rb.GetImageNamed(IDR_AURA_LAUNCHER_OVERFLOW_HOT).ToSkBitmap());
   overflow_button_->SetImage(
       views::CustomButton::BS_PUSHED,
       rb.GetImageNamed(IDR_AURA_LAUNCHER_OVERFLOW_PUSHED).ToSkBitmap());
   ConfigureChildView(overflow_button_);
   AddChildView(overflow_button_);
 
   // We'll layout when our bounds change.
 }
 
 void LauncherView::LayoutToIdealBounds() {
   IdealBounds ideal_bounds;
   CalculateIdealBounds(&ideal_bounds);
+  show_apps_button_->SetBoundsRect(ideal_bounds.show_apps_bounds);
   new_browser_button_->SetBoundsRect(ideal_bounds.new_browser_bounds);
-  show_apps_button_->SetBoundsRect(ideal_bounds.show_apps_bounds);
   ViewModelUtils::SetViewBoundsToIdealBounds(*view_model_);
 }
 
 void LauncherView::CalculateIdealBounds(IdealBounds* bounds) {
   int available_width = width();
   if (!available_width)
     return;
 
-  // new_browser_button first.
+  // show_apps_button_ first.
   int x = kLeadingInset;
-  gfx::Size pref = new_browser_button_->GetPreferredSize();
-  bounds->new_browser_bounds = gfx::Rect(
+  gfx::Size pref = show_apps_button_->GetPreferredSize();
+  bounds->show_apps_bounds = gfx::Rect(
       x, (kPreferredHeight - pref.height()) / 2, pref.width(), pref.height());
-  x += bounds->new_browser_bounds.width() + kHorizontalPadding;
+  x += bounds->show_apps_bounds.width() + kHorizontalPadding;
+  // TODO: remove when we get better images.
+  x -= 6;
 
   // Then launcher buttons.
   for (int i = 0; i < view_model_->view_size(); ++i) {
     pref = view_model_->view_at(i)->GetPreferredSize();
     view_model_->set_ideal_bounds(i, gfx::Rect(
         x, (kPreferredHeight - pref.height()) / 2, pref.width(),
         pref.height()));
     x += pref.width() + kHorizontalPadding;
   }
 
-  // Show apps button and overflow button.
-  bounds->show_apps_bounds.set_size(show_apps_button_->GetPreferredSize());
+  // new_browser_button_ and overflow button.
+  bounds->new_browser_bounds.set_size(new_browser_button_->GetPreferredSize());
   bounds->overflow_bounds.set_size(overflow_button_->GetPreferredSize());
   int last_visible_index = DetermineLastVisibleIndex(
-      available_width - kLeadingInset - bounds->show_apps_bounds.width() -
+      available_width - kLeadingInset - bounds->new_browser_bounds.width() -
       kHorizontalPadding - bounds->overflow_bounds.width() -
       kHorizontalPadding);
   bool show_overflow = (last_visible_index + 1 != view_model_->view_size());
   if (overflow_button_->visible() != show_overflow) {
     // Only change visibility of the views if the visibility of the overflow
     // button changes. Otherwise we'll effect the insertion animation, which
     // changes the visibility.
     for (int i = 0; i <= last_visible_index; ++i)
       view_model_->view_at(i)->SetVisible(true);
     for (int i = last_visible_index + 1; i < view_model_->view_size(); ++i)
       view_model_->view_at(i)->SetVisible(false);
   }
 
   overflow_button_->SetVisible(show_overflow);
   if (show_overflow) {
     DCHECK_NE(0, view_model_->view_size());
     x = view_model_->ideal_bounds(last_visible_index).right() +
         kHorizontalPadding;
     bounds->overflow_bounds.set_x(x);
     bounds->overflow_bounds.set_y(
         (kPreferredHeight - bounds->overflow_bounds.height()) / 2);
     x = bounds->overflow_bounds.right() + kHorizontalPadding;
   }
-  // TODO(sky): -6 is a hack, remove when we get better images.
-  bounds->show_apps_bounds.set_x(x - 6);
-  bounds->show_apps_bounds.set_y(
-      (kPreferredHeight - bounds->show_apps_bounds.height()) / 2);
+  bounds->new_browser_bounds.set_x(x);
+  bounds->new_browser_bounds.set_y(
+      (kPreferredHeight - bounds->new_browser_bounds.height()) / 2);
 }
 
 int LauncherView::DetermineLastVisibleIndex(int max_x) {
   int index = view_model_->view_size() - 1;
   while (index >= 0 && view_model_->ideal_bounds(index).right() > max_x)
     index--;
   return index;
 }
 
 void LauncherView::AnimateToIdealBounds() {
@@ skipping 139 matching lines @@
   if (!was_dragging)
     return;
 
   view_model_->Move(view_model_->GetIndexOfView(drag_view), start_drag_index_);
   AnimateToIdealBounds();
 }
 
 gfx::Size LauncherView::GetPreferredSize() {
   IdealBounds ideal_bounds;
   CalculateIdealBounds(&ideal_bounds);
-  return gfx::Size(ideal_bounds.show_apps_bounds.right() + kLeadingInset,
+  return gfx::Size(ideal_bounds.new_browser_bounds.right() + kLeadingInset,
                    kPreferredHeight);
 }
 
 void LauncherView::OnBoundsChanged(const gfx::Rect& previous_bounds) {
   LayoutToIdealBounds();
 }
 
 void LauncherView::LauncherItemAdded(int model_index) {
   CancelDrag(NULL);
 
@@ skipping 91 matching lines @@
   } else {
     int view_index = view_model_->GetIndexOfView(sender);
     // May be -1 while in the process of animating closed.
     if (view_index != -1)
       delegate->LauncherItemClicked(model_->items()[view_index]);
   }
 }
 
 }  // namespace internal
 }  // namespace aura_shell