Compact Navigation prototype

chrome/browser/ui/views/tabs/base_tab.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/base_tab.h"
 
 #include <limits>
 
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
@@ skipping 13 matching lines @@
 #include "ui/base/animation/slide_animation.h"
 #include "ui/base/animation/throb_animation.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/text/text_elider.h"
 #include "ui/base/theme_provider.h"
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/favicon_size.h"
 #include "ui/gfx/font.h"
 #include "views/controls/button/image_button.h"
+#include "views/widget/widget.h"

[sky, 2011/05/03 18:38:32]

Is this needed?

[SteveT, 2011/05/06 18:48:43]

Removed.

 
 // How long the pulse throb takes.
 static const int kPulseDurationMs = 200;
 
 // How long the hover state takes.
 static const int kHoverDurationMs = 400;
 
 namespace {
 
 ////////////////////////////////////////////////////////////////////////////////
@@ skipping 250 matching lines @@
     } else if (event.IsShiftDown()) {
       controller()->ExtendSelectionTo(this);
     } else if (event.IsControlDown()) {
       controller()->ToggleSelected(this);
       if (!IsSelected()) {
         // Don't allow dragging non-selected tabs.
         return false;
       }
     } else if (!IsSelected()) {
       controller()->SelectTab(this);
+    } else {
+      if (IsActive()) {

[sky, 2011/05/03 18:38:32]

combine with else on 305

[SteveT, 2011/05/06 18:48:43]

Done.

+        controller()->ReselectTab(this);
+      }
     }
     controller()->MaybeStartDrag(this, event);
   }
   return true;
 }
 
 bool BaseTab::OnMouseDragged(const views::MouseEvent& event) {
   if (controller())
     controller()->ContinueDrag(event);
   return true;
@@ skipping 275 matching lines @@
 // static
 void BaseTab::InitResources() {
   static bool initialized = false;
   if (!initialized) {
     initialized = true;
     font_ = new gfx::Font(
         ResourceBundle::GetSharedInstance().GetFont(ResourceBundle::BaseFont));
     font_height_ = font_->GetHeight();
   }
 }