Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(831)

Side by Side Diff: chrome/browser/gtk/browser_toolbar_gtk.cc

Issue 5104002: Cleanup: Include browser.h -> ui/browser.h [Part 4]. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 10 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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
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/logging.h" 17 #include "base/logging.h"
18 #include "base/path_service.h" 18 #include "base/path_service.h"
19 #include "base/singleton.h" 19 #include "base/singleton.h"
20 #include "chrome/app/chrome_command_ids.h" 20 #include "chrome/app/chrome_command_ids.h"
21 #include "chrome/browser/browser.h"
22 #include "chrome/browser/encoding_menu_controller.h" 21 #include "chrome/browser/encoding_menu_controller.h"
23 #include "chrome/browser/gtk/accelerators_gtk.h" 22 #include "chrome/browser/gtk/accelerators_gtk.h"
24 #include "chrome/browser/gtk/back_forward_button_gtk.h" 23 #include "chrome/browser/gtk/back_forward_button_gtk.h"
25 #include "chrome/browser/gtk/browser_actions_toolbar_gtk.h" 24 #include "chrome/browser/gtk/browser_actions_toolbar_gtk.h"
26 #include "chrome/browser/gtk/browser_window_gtk.h" 25 #include "chrome/browser/gtk/browser_window_gtk.h"
27 #include "chrome/browser/gtk/cairo_cached_surface.h" 26 #include "chrome/browser/gtk/cairo_cached_surface.h"
28 #include "chrome/browser/gtk/custom_button.h" 27 #include "chrome/browser/gtk/custom_button.h"
29 #include "chrome/browser/gtk/gtk_chrome_button.h" 28 #include "chrome/browser/gtk/gtk_chrome_button.h"
30 #include "chrome/browser/gtk/gtk_theme_provider.h" 29 #include "chrome/browser/gtk/gtk_theme_provider.h"
31 #include "chrome/browser/gtk/gtk_util.h" 30 #include "chrome/browser/gtk/gtk_util.h"
32 #include "chrome/browser/gtk/location_bar_view_gtk.h" 31 #include "chrome/browser/gtk/location_bar_view_gtk.h"
33 #include "chrome/browser/gtk/reload_button_gtk.h" 32 #include "chrome/browser/gtk/reload_button_gtk.h"
34 #include "chrome/browser/gtk/rounded_window.h" 33 #include "chrome/browser/gtk/rounded_window.h"
35 #include "chrome/browser/gtk/tabs/tab_strip_gtk.h" 34 #include "chrome/browser/gtk/tabs/tab_strip_gtk.h"
36 #include "chrome/browser/gtk/view_id_util.h" 35 #include "chrome/browser/gtk/view_id_util.h"
37 #include "chrome/browser/net/url_fixer_upper.h" 36 #include "chrome/browser/net/url_fixer_upper.h"
38 #include "chrome/browser/prefs/pref_service.h" 37 #include "chrome/browser/prefs/pref_service.h"
39 #include "chrome/browser/profile.h" 38 #include "chrome/browser/profile.h"
40 #include "chrome/browser/tab_contents/tab_contents.h" 39 #include "chrome/browser/tab_contents/tab_contents.h"
41 #include "chrome/browser/themes/browser_theme_provider.h" 40 #include "chrome/browser/themes/browser_theme_provider.h"
41 #include "chrome/browser/ui/browser.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"
49 #include "gfx/canvas_skia_paint.h" 49 #include "gfx/canvas_skia_paint.h"
50 #include "gfx/gtk_util.h" 50 #include "gfx/gtk_util.h"
51 #include "gfx/skbitmap_operations.h" 51 #include "gfx/skbitmap_operations.h"
(...skipping 656 matching lines...) Expand 10 before | Expand all | Expand 10 after
708 708
709 return FALSE; 709 return FALSE;
710 } 710 }
711 711
712 bool BrowserToolbarGtk::UpgradeAnimationIsFaded() { 712 bool BrowserToolbarGtk::UpgradeAnimationIsFaded() {
713 return upgrade_reminder_animation_.cycles_remaining() > 0 && 713 return upgrade_reminder_animation_.cycles_remaining() > 0 &&
714 // This funky looking math makes the badge throb for 2 seconds once 714 // This funky looking math makes the badge throb for 2 seconds once
715 // every 8 seconds. 715 // every 8 seconds.
716 ((upgrade_reminder_animation_.cycles_remaining() - 1) / 2) % 4 == 0; 716 ((upgrade_reminder_animation_.cycles_remaining() - 1) / 2) % 4 == 0;
717 } 717 }
OLDNEW
« no previous file with comments | « chrome/browser/gtk/browser_titlebar.cc ('k') | chrome/browser/gtk/download_in_progress_dialog_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698