OLD | NEW |
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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_titlebar.h" | 5 #include "chrome/browser/gtk/browser_titlebar.h" |
6 | 6 |
7 #include <gdk/gdkkeysyms.h> | 7 #include <gdk/gdkkeysyms.h> |
8 #include <gtk/gtk.h> | 8 #include <gtk/gtk.h> |
9 | 9 |
10 #include <string> | 10 #include <string> |
11 #include <vector> | 11 #include <vector> |
12 | 12 |
| 13 #include "app/gfx/gtk_util.h" |
13 #include "app/gfx/skbitmap_operations.h" | 14 #include "app/gfx/skbitmap_operations.h" |
14 #include "app/l10n_util.h" | 15 #include "app/l10n_util.h" |
15 #include "app/resource_bundle.h" | 16 #include "app/resource_bundle.h" |
16 #include "base/gfx/gtk_util.h" | |
17 #include "chrome/app/chrome_dll_resource.h" | 17 #include "chrome/app/chrome_dll_resource.h" |
18 #include "chrome/browser/browser.h" | 18 #include "chrome/browser/browser.h" |
19 #include "chrome/browser/encoding_menu_controller.h" | 19 #include "chrome/browser/encoding_menu_controller.h" |
20 #include "chrome/browser/gtk/browser_window_gtk.h" | 20 #include "chrome/browser/gtk/browser_window_gtk.h" |
21 #include "chrome/browser/gtk/custom_button.h" | 21 #include "chrome/browser/gtk/custom_button.h" |
22 #include "chrome/browser/gtk/gtk_theme_provider.h" | 22 #include "chrome/browser/gtk/gtk_theme_provider.h" |
23 #include "chrome/browser/gtk/menu_gtk.h" | 23 #include "chrome/browser/gtk/menu_gtk.h" |
24 #include "chrome/browser/gtk/nine_box.h" | 24 #include "chrome/browser/gtk/nine_box.h" |
25 #include "chrome/browser/gtk/standard_menus.h" | 25 #include "chrome/browser/gtk/standard_menus.h" |
26 #include "chrome/browser/gtk/tabs/tab_strip_gtk.h" | 26 #include "chrome/browser/gtk/tabs/tab_strip_gtk.h" |
(...skipping 669 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
696 if (g_throbber_frames) | 696 if (g_throbber_frames) |
697 return; | 697 return; |
698 | 698 |
699 // We load the light version of the throbber since it'll be in the titlebar. | 699 // We load the light version of the throbber since it'll be in the titlebar. |
700 g_throbber_frames = new std::vector<GdkPixbuf*>; | 700 g_throbber_frames = new std::vector<GdkPixbuf*>; |
701 MakeThrobberFrames(IDR_THROBBER_LIGHT, g_throbber_frames); | 701 MakeThrobberFrames(IDR_THROBBER_LIGHT, g_throbber_frames); |
702 | 702 |
703 g_throbber_waiting_frames = new std::vector<GdkPixbuf*>; | 703 g_throbber_waiting_frames = new std::vector<GdkPixbuf*>; |
704 MakeThrobberFrames(IDR_THROBBER_WAITING_LIGHT, g_throbber_waiting_frames); | 704 MakeThrobberFrames(IDR_THROBBER_WAITING_LIGHT, g_throbber_waiting_frames); |
705 } | 705 } |
OLD | NEW |