| 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 23 matching lines...) Expand all Loading... |
| 34 #include "chrome/browser/gtk/tabs/tab_strip_gtk.h" | 34 #include "chrome/browser/gtk/tabs/tab_strip_gtk.h" |
| 35 #include "chrome/browser/gtk/view_id_util.h" | 35 #include "chrome/browser/gtk/view_id_util.h" |
| 36 #include "chrome/browser/net/url_fixer_upper.h" | 36 #include "chrome/browser/net/url_fixer_upper.h" |
| 37 #include "chrome/browser/prefs/pref_service.h" | 37 #include "chrome/browser/prefs/pref_service.h" |
| 38 #include "chrome/browser/profiles/profile.h" | 38 #include "chrome/browser/profiles/profile.h" |
| 39 #include "chrome/browser/tab_contents/tab_contents.h" | 39 #include "chrome/browser/tab_contents/tab_contents.h" |
| 40 #include "chrome/browser/themes/browser_theme_provider.h" | 40 #include "chrome/browser/themes/browser_theme_provider.h" |
| 41 #include "chrome/browser/ui/browser.h" | 41 #include "chrome/browser/ui/browser.h" |
| 42 #include "chrome/browser/ui/toolbar/encoding_menu_controller.h" | 42 #include "chrome/browser/ui/toolbar/encoding_menu_controller.h" |
| 43 #include "chrome/browser/upgrade_detector.h" | 43 #include "chrome/browser/upgrade_detector.h" |
| 44 #include "chrome/common/chrome_switches.h" | |
| 45 #include "chrome/common/notification_details.h" | 44 #include "chrome/common/notification_details.h" |
| 46 #include "chrome/common/notification_service.h" | 45 #include "chrome/common/notification_service.h" |
| 47 #include "chrome/common/notification_type.h" | 46 #include "chrome/common/notification_type.h" |
| 48 #include "chrome/common/pref_names.h" | 47 #include "chrome/common/pref_names.h" |
| 49 #include "chrome/common/url_constants.h" | 48 #include "chrome/common/url_constants.h" |
| 50 #include "gfx/canvas_skia_paint.h" | 49 #include "gfx/canvas_skia_paint.h" |
| 51 #include "gfx/gtk_util.h" | 50 #include "gfx/gtk_util.h" |
| 52 #include "gfx/skbitmap_operations.h" | 51 #include "gfx/skbitmap_operations.h" |
| 53 #include "grit/chromium_strings.h" | 52 #include "grit/chromium_strings.h" |
| 54 #include "grit/generated_resources.h" | 53 #include "grit/generated_resources.h" |
| (...skipping 596 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 651 int x_offset = base::i18n::IsRTL() ? 0 : | 650 int x_offset = base::i18n::IsRTL() ? 0 : |
| 652 sender->allocation.width - badge->width(); | 651 sender->allocation.width - badge->width(); |
| 653 int y_offset = 0; | 652 int y_offset = 0; |
| 654 canvas.DrawBitmapInt( | 653 canvas.DrawBitmapInt( |
| 655 *badge, | 654 *badge, |
| 656 sender->allocation.x + x_offset, | 655 sender->allocation.x + x_offset, |
| 657 sender->allocation.y + y_offset); | 656 sender->allocation.y + y_offset); |
| 658 | 657 |
| 659 return FALSE; | 658 return FALSE; |
| 660 } | 659 } |
| OLD | NEW |