| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/gtk/browser_toolbar_gtk.h" | 5 #include "chrome/browser/gtk/browser_toolbar_gtk.h" |
| 6 | 6 |
| 7 #include <X11/XF86keysym.h> | 7 #include <X11/XF86keysym.h> |
| 8 #include <gdk/gdkkeysyms.h> | 8 #include <gdk/gdkkeysyms.h> |
| 9 #include <gtk/gtk.h> | 9 #include <gtk/gtk.h> |
| 10 | 10 |
| (...skipping 17 matching lines...) Expand all Loading... |
| 28 #include "chrome/browser/gtk/custom_button.h" | 28 #include "chrome/browser/gtk/custom_button.h" |
| 29 #include "chrome/browser/gtk/gtk_chrome_button.h" | 29 #include "chrome/browser/gtk/gtk_chrome_button.h" |
| 30 #include "chrome/browser/gtk/gtk_theme_provider.h" | 30 #include "chrome/browser/gtk/gtk_theme_provider.h" |
| 31 #include "chrome/browser/gtk/gtk_util.h" | 31 #include "chrome/browser/gtk/gtk_util.h" |
| 32 #include "chrome/browser/gtk/location_bar_view_gtk.h" | 32 #include "chrome/browser/gtk/location_bar_view_gtk.h" |
| 33 #include "chrome/browser/gtk/reload_button_gtk.h" | 33 #include "chrome/browser/gtk/reload_button_gtk.h" |
| 34 #include "chrome/browser/gtk/rounded_window.h" | 34 #include "chrome/browser/gtk/rounded_window.h" |
| 35 #include "chrome/browser/gtk/tabs/tab_strip_gtk.h" | 35 #include "chrome/browser/gtk/tabs/tab_strip_gtk.h" |
| 36 #include "chrome/browser/gtk/view_id_util.h" | 36 #include "chrome/browser/gtk/view_id_util.h" |
| 37 #include "chrome/browser/net/url_fixer_upper.h" | 37 #include "chrome/browser/net/url_fixer_upper.h" |
| 38 #include "chrome/browser/pref_service.h" | 38 #include "chrome/browser/prefs/pref_service.h" |
| 39 #include "chrome/browser/profile.h" | 39 #include "chrome/browser/profile.h" |
| 40 #include "chrome/browser/tab_contents/tab_contents.h" | 40 #include "chrome/browser/tab_contents/tab_contents.h" |
| 41 #include "chrome/browser/themes/browser_theme_provider.h" | 41 #include "chrome/browser/themes/browser_theme_provider.h" |
| 42 #include "chrome/browser/upgrade_detector.h" | 42 #include "chrome/browser/upgrade_detector.h" |
| 43 #include "chrome/common/chrome_switches.h" | 43 #include "chrome/common/chrome_switches.h" |
| 44 #include "chrome/common/notification_details.h" | 44 #include "chrome/common/notification_details.h" |
| 45 #include "chrome/common/notification_service.h" | 45 #include "chrome/common/notification_service.h" |
| 46 #include "chrome/common/notification_type.h" | 46 #include "chrome/common/notification_type.h" |
| 47 #include "chrome/common/pref_names.h" | 47 #include "chrome/common/pref_names.h" |
| 48 #include "chrome/common/url_constants.h" | 48 #include "chrome/common/url_constants.h" |
| (...skipping 664 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 713 | 713 |
| 714 return FALSE; | 714 return FALSE; |
| 715 } | 715 } |
| 716 | 716 |
| 717 bool BrowserToolbarGtk::UpgradeAnimationIsFaded() { | 717 bool BrowserToolbarGtk::UpgradeAnimationIsFaded() { |
| 718 return upgrade_reminder_animation_.cycles_remaining() > 0 && | 718 return upgrade_reminder_animation_.cycles_remaining() > 0 && |
| 719 // This funky looking math makes the badge throb for 2 seconds once | 719 // This funky looking math makes the badge throb for 2 seconds once |
| 720 // every 8 seconds. | 720 // every 8 seconds. |
| 721 ((upgrade_reminder_animation_.cycles_remaining() - 1) / 2) % 4 == 0; | 721 ((upgrade_reminder_animation_.cycles_remaining() - 1) / 2) % 4 == 0; |
| 722 } | 722 } |
| OLD | NEW |