| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/ui/gtk/browser_toolbar_gtk.h" | 5 #include "chrome/browser/ui/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 26 matching lines...) Expand all Loading... |
| 37 #include "chrome/browser/ui/gtk/rounded_window.h" | 37 #include "chrome/browser/ui/gtk/rounded_window.h" |
| 38 #include "chrome/browser/ui/gtk/tabs/tab_strip_gtk.h" | 38 #include "chrome/browser/ui/gtk/tabs/tab_strip_gtk.h" |
| 39 #include "chrome/browser/ui/gtk/view_id_util.h" | 39 #include "chrome/browser/ui/gtk/view_id_util.h" |
| 40 #include "chrome/browser/ui/toolbar/encoding_menu_controller.h" | 40 #include "chrome/browser/ui/toolbar/encoding_menu_controller.h" |
| 41 #include "chrome/browser/upgrade_detector.h" | 41 #include "chrome/browser/upgrade_detector.h" |
| 42 #include "chrome/common/chrome_notification_types.h" | 42 #include "chrome/common/chrome_notification_types.h" |
| 43 #include "chrome/common/pref_names.h" | 43 #include "chrome/common/pref_names.h" |
| 44 #include "chrome/common/url_constants.h" | 44 #include "chrome/common/url_constants.h" |
| 45 #include "content/browser/tab_contents/tab_contents.h" | 45 #include "content/browser/tab_contents/tab_contents.h" |
| 46 #include "content/browser/user_metrics.h" | 46 #include "content/browser/user_metrics.h" |
| 47 #include "content/public/browser/notification_details.h" |
| 47 #include "content/public/browser/notification_service.h" | 48 #include "content/public/browser/notification_service.h" |
| 48 #include "content/public/browser/notification_details.h" | |
| 49 #include "grit/chromium_strings.h" | 49 #include "grit/chromium_strings.h" |
| 50 #include "grit/generated_resources.h" | 50 #include "grit/generated_resources.h" |
| 51 #include "grit/theme_resources.h" | 51 #include "grit/theme_resources.h" |
| 52 #include "grit/theme_resources_standard.h" | 52 #include "grit/theme_resources_standard.h" |
| 53 #include "ui/base/accelerators/accelerator_gtk.h" |
| 53 #include "ui/base/dragdrop/gtk_dnd_util.h" | 54 #include "ui/base/dragdrop/gtk_dnd_util.h" |
| 54 #include "ui/base/l10n/l10n_util.h" | 55 #include "ui/base/l10n/l10n_util.h" |
| 55 #include "ui/base/models/accelerator_gtk.h" | |
| 56 #include "ui/gfx/canvas_skia_paint.h" | 56 #include "ui/gfx/canvas_skia_paint.h" |
| 57 #include "ui/gfx/gtk_util.h" | 57 #include "ui/gfx/gtk_util.h" |
| 58 #include "ui/gfx/skbitmap_operations.h" | 58 #include "ui/gfx/skbitmap_operations.h" |
| 59 | 59 |
| 60 namespace { | 60 namespace { |
| 61 | 61 |
| 62 // Padding on left and right of the left toolbar buttons (back, forward, reload, | 62 // Padding on left and right of the left toolbar buttons (back, forward, reload, |
| 63 // etc.). | 63 // etc.). |
| 64 const int kToolbarLeftAreaPadding = 4; | 64 const int kToolbarLeftAreaPadding = 4; |
| 65 | 65 |
| (...skipping 599 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 665 int x_offset = base::i18n::IsRTL() ? 0 : | 665 int x_offset = base::i18n::IsRTL() ? 0 : |
| 666 sender->allocation.width - badge->width(); | 666 sender->allocation.width - badge->width(); |
| 667 int y_offset = 0; | 667 int y_offset = 0; |
| 668 canvas.DrawBitmapInt( | 668 canvas.DrawBitmapInt( |
| 669 *badge, | 669 *badge, |
| 670 sender->allocation.x + x_offset, | 670 sender->allocation.x + x_offset, |
| 671 sender->allocation.y + y_offset); | 671 sender->allocation.y + y_offset); |
| 672 | 672 |
| 673 return FALSE; | 673 return FALSE; |
| 674 } | 674 } |
| OLD | NEW |