| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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/views/toolbar_star_toggle.h" | 5 #include "chrome/browser/views/toolbar_star_toggle.h" |
| 6 | 6 |
| 7 #include "chrome/app/theme/theme_resources.h" | 7 #include "chrome/app/theme/theme_resources.h" |
| 8 #include "chrome/browser/bookmarks/bookmark_model.h" | 8 #include "chrome/browser/bookmarks/bookmark_model.h" |
| 9 #include "chrome/browser/browser.h" | 9 #include "chrome/browser/browser.h" |
| 10 #include "chrome/browser/views/bookmark_bubble_view.h" | 10 #include "chrome/browser/views/bookmark_bubble_view.h" |
| 11 #include "chrome/browser/views/toolbar_view.h" | 11 #include "chrome/browser/views/toolbar_view.h" |
| 12 #include "chrome/common/resource_bundle.h" | 12 #include "chrome/common/resource_bundle.h" |
| 13 #include "googleurl/src/gurl.h" | 13 #include "googleurl/src/gurl.h" |
| 14 | 14 |
| 15 using base::TimeTicks; |
| 16 |
| 15 // The amount of time (in milliseconds) between when the bubble closes and when | 17 // The amount of time (in milliseconds) between when the bubble closes and when |
| 16 // pressing on the button again does something. Yes, this is a hackish. I tried | 18 // pressing on the button again does something. Yes, this is a hackish. I tried |
| 17 // many different options, all to no avail: | 19 // many different options, all to no avail: |
| 18 // . Keying off mouse activation: this didn't work as there is no way to know | 20 // . Keying off mouse activation: this didn't work as there is no way to know |
| 19 // which window receives the activation. Additionally once the mouse | 21 // which window receives the activation. Additionally once the mouse |
| 20 // activation occurs we have no way to tie the next mouse event to the mouse | 22 // activation occurs we have no way to tie the next mouse event to the mouse |
| 21 // activation. | 23 // activation. |
| 22 // . Watching all events as we dispatch them in the MessageLoop. Mouse | 24 // . Watching all events as we dispatch them in the MessageLoop. Mouse |
| 23 // activation isn't an observable event though. | 25 // activation isn't an observable event though. |
| 24 // Ideally we could use mouse capture for this, but we can't use mouse capture | 26 // Ideally we could use mouse capture for this, but we can't use mouse capture |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 81 | 83 |
| 82 void ToolbarStarToggle::InfoBubbleClosing(InfoBubble* info_bubble) { | 84 void ToolbarStarToggle::InfoBubbleClosing(InfoBubble* info_bubble) { |
| 83 is_bubble_showing_ = false; | 85 is_bubble_showing_ = false; |
| 84 SchedulePaint(); | 86 SchedulePaint(); |
| 85 bubble_closed_time_ = TimeTicks::Now(); | 87 bubble_closed_time_ = TimeTicks::Now(); |
| 86 } | 88 } |
| 87 | 89 |
| 88 bool ToolbarStarToggle::CloseOnEscape() { | 90 bool ToolbarStarToggle::CloseOnEscape() { |
| 89 return true; | 91 return true; |
| 90 } | 92 } |
| 91 | |
| OLD | NEW |