| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/views/ash/tab_scrubber.h" | 5 #include "chrome/browser/ui/views/ash/tab_scrubber.h" |
| 6 | 6 |
| 7 #include <stdint.h> |
| 8 |
| 7 #include "ash/shell.h" | 9 #include "ash/shell.h" |
| 8 #include "ash/wm/window_util.h" | 10 #include "ash/wm/window_util.h" |
| 9 #include "base/metrics/histogram.h" | 11 #include "base/metrics/histogram.h" |
| 10 #include "chrome/browser/chrome_notification_types.h" | 12 #include "chrome/browser/chrome_notification_types.h" |
| 11 #include "chrome/browser/ui/browser.h" | 13 #include "chrome/browser/ui/browser.h" |
| 12 #include "chrome/browser/ui/browser_finder.h" | 14 #include "chrome/browser/ui/browser_finder.h" |
| 13 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 15 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 14 #include "chrome/browser/ui/views/frame/browser_view.h" | 16 #include "chrome/browser/ui/views/frame/browser_view.h" |
| 15 #include "chrome/browser/ui/views/tabs/tab.h" | 17 #include "chrome/browser/ui/views/tabs/tab.h" |
| 16 #include "chrome/browser/ui/views/tabs/tab_strip.h" | 18 #include "chrome/browser/ui/views/tabs/tab_strip.h" |
| 17 #include "content/public/browser/notification_service.h" | 19 #include "content/public/browser/notification_service.h" |
| 18 #include "content/public/browser/notification_source.h" | 20 #include "content/public/browser/notification_source.h" |
| 19 #include "ui/aura/window.h" | 21 #include "ui/aura/window.h" |
| 20 #include "ui/events/event.h" | 22 #include "ui/events/event.h" |
| 21 #include "ui/events/event_utils.h" | 23 #include "ui/events/event_utils.h" |
| 22 #include "ui/events/gesture_detection/gesture_configuration.h" | 24 #include "ui/events/gesture_detection/gesture_configuration.h" |
| 23 #include "ui/views/controls/glow_hover_controller.h" | 25 #include "ui/views/controls/glow_hover_controller.h" |
| 24 | 26 |
| 25 namespace { | 27 namespace { |
| 26 const int64 kActivationDelayMS = 200; | 28 const int64_t kActivationDelayMS = 200; |
| 27 } | 29 } |
| 28 | 30 |
| 29 // static | 31 // static |
| 30 TabScrubber* TabScrubber::GetInstance() { | 32 TabScrubber* TabScrubber::GetInstance() { |
| 31 static TabScrubber* instance = NULL; | 33 static TabScrubber* instance = NULL; |
| 32 if (!instance) | 34 if (!instance) |
| 33 instance = new TabScrubber(); | 35 instance = new TabScrubber(); |
| 34 return instance; | 36 return instance; |
| 35 } | 37 } |
| 36 | 38 |
| (...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 335 tab->hover_controller()->HideImmediately(); | 337 tab->hover_controller()->HideImmediately(); |
| 336 } | 338 } |
| 337 | 339 |
| 338 if (new_index != browser_->tab_strip_model()->active_index()) { | 340 if (new_index != browser_->tab_strip_model()->active_index()) { |
| 339 highlighted_tab_ = new_index; | 341 highlighted_tab_ = new_index; |
| 340 new_tab->hover_controller()->Show(views::GlowHoverController::PRONOUNCED); | 342 new_tab->hover_controller()->Show(views::GlowHoverController::PRONOUNCED); |
| 341 } else { | 343 } else { |
| 342 highlighted_tab_ = -1; | 344 highlighted_tab_ = -1; |
| 343 } | 345 } |
| 344 } | 346 } |
| OLD | NEW |