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 <gdk/gdkkeysyms.h> | 7 #include <gdk/gdkkeysyms.h> |
8 #include <gtk/gtk.h> | 8 #include <gtk/gtk.h> |
9 #include <X11/XF86keysym.h> | 9 #include <X11/XF86keysym.h> |
10 | 10 |
11 #include "app/gtk_dnd_util.h" | 11 #include "app/gtk_dnd_util.h" |
12 #include "app/l10n_util.h" | 12 #include "app/l10n_util.h" |
13 #include "app/menus/accelerator_gtk.h" | 13 #include "app/menus/accelerator_gtk.h" |
14 #include "base/base_paths.h" | 14 #include "base/base_paths.h" |
15 #include "base/command_line.h" | 15 #include "base/command_line.h" |
16 #include "base/i18n/rtl.h" | 16 #include "base/i18n/rtl.h" |
17 #include "base/keyboard_codes_posix.h" | |
18 #include "base/logging.h" | 17 #include "base/logging.h" |
19 #include "base/path_service.h" | 18 #include "base/path_service.h" |
20 #include "base/singleton.h" | 19 #include "base/singleton.h" |
21 #include "chrome/app/chrome_dll_resource.h" | 20 #include "chrome/app/chrome_dll_resource.h" |
22 #include "chrome/browser/browser.h" | 21 #include "chrome/browser/browser.h" |
23 #include "chrome/browser/browser_theme_provider.h" | 22 #include "chrome/browser/browser_theme_provider.h" |
24 #include "chrome/browser/encoding_menu_controller.h" | 23 #include "chrome/browser/encoding_menu_controller.h" |
25 #include "chrome/browser/gtk/accelerators_gtk.h" | 24 #include "chrome/browser/gtk/accelerators_gtk.h" |
26 #include "chrome/browser/gtk/back_forward_button_gtk.h" | 25 #include "chrome/browser/gtk/back_forward_button_gtk.h" |
27 #include "chrome/browser/gtk/browser_actions_toolbar_gtk.h" | 26 #include "chrome/browser/gtk/browser_actions_toolbar_gtk.h" |
(...skipping 680 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
708 | 707 |
709 return FALSE; | 708 return FALSE; |
710 } | 709 } |
711 | 710 |
712 bool BrowserToolbarGtk::UpgradeAnimationIsFaded() { | 711 bool BrowserToolbarGtk::UpgradeAnimationIsFaded() { |
713 return upgrade_reminder_animation_.cycles_remaining() > 0 && | 712 return upgrade_reminder_animation_.cycles_remaining() > 0 && |
714 // This funky looking math makes the badge throb for 2 seconds once | 713 // This funky looking math makes the badge throb for 2 seconds once |
715 // every 8 seconds. | 714 // every 8 seconds. |
716 ((upgrade_reminder_animation_.cycles_remaining() - 1) / 2) % 4 == 0; | 715 ((upgrade_reminder_animation_.cycles_remaining() - 1) / 2) % 4 == 0; |
717 } | 716 } |
OLD | NEW |