| 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 28 matching lines...) Expand all  Loading... | 
| 39 #include "chrome/browser/upgrade_detector.h" | 39 #include "chrome/browser/upgrade_detector.h" | 
| 40 #include "chrome/common/pref_names.h" | 40 #include "chrome/common/pref_names.h" | 
| 41 #include "chrome/common/url_constants.h" | 41 #include "chrome/common/url_constants.h" | 
| 42 #include "content/browser/tab_contents/tab_contents.h" | 42 #include "content/browser/tab_contents/tab_contents.h" | 
| 43 #include "content/common/notification_details.h" | 43 #include "content/common/notification_details.h" | 
| 44 #include "content/common/notification_service.h" | 44 #include "content/common/notification_service.h" | 
| 45 #include "content/common/notification_type.h" | 45 #include "content/common/notification_type.h" | 
| 46 #include "grit/chromium_strings.h" | 46 #include "grit/chromium_strings.h" | 
| 47 #include "grit/generated_resources.h" | 47 #include "grit/generated_resources.h" | 
| 48 #include "grit/theme_resources.h" | 48 #include "grit/theme_resources.h" | 
|  | 49 #include "grit/theme_resources_standard.h" | 
| 49 #include "ui/base/dragdrop/gtk_dnd_util.h" | 50 #include "ui/base/dragdrop/gtk_dnd_util.h" | 
| 50 #include "ui/base/l10n/l10n_util.h" | 51 #include "ui/base/l10n/l10n_util.h" | 
| 51 #include "ui/base/models/accelerator_gtk.h" | 52 #include "ui/base/models/accelerator_gtk.h" | 
| 52 #include "ui/gfx/canvas_skia_paint.h" | 53 #include "ui/gfx/canvas_skia_paint.h" | 
| 53 #include "ui/gfx/gtk_util.h" | 54 #include "ui/gfx/gtk_util.h" | 
| 54 #include "ui/gfx/skbitmap_operations.h" | 55 #include "ui/gfx/skbitmap_operations.h" | 
| 55 | 56 | 
| 56 namespace { | 57 namespace { | 
| 57 | 58 | 
| 58 // Padding on left and right of the left toolbar buttons (back, forward, reload, | 59 // Padding on left and right of the left toolbar buttons (back, forward, reload, | 
| (...skipping 580 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 639   int x_offset = base::i18n::IsRTL() ? 0 : | 640   int x_offset = base::i18n::IsRTL() ? 0 : | 
| 640       sender->allocation.width - badge->width(); | 641       sender->allocation.width - badge->width(); | 
| 641   int y_offset = 0; | 642   int y_offset = 0; | 
| 642   canvas.DrawBitmapInt( | 643   canvas.DrawBitmapInt( | 
| 643       *badge, | 644       *badge, | 
| 644       sender->allocation.x + x_offset, | 645       sender->allocation.x + x_offset, | 
| 645       sender->allocation.y + y_offset); | 646       sender->allocation.y + y_offset); | 
| 646 | 647 | 
| 647   return FALSE; | 648   return FALSE; | 
| 648 } | 649 } | 
| OLD | NEW | 
|---|