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

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

Issue 6312156: Change includes of gfx/* to ui/gfx/* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 10 months 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
« no previous file with comments | « chrome/browser/ui/gtk/browser_titlebar.cc ('k') | chrome/browser/ui/gtk/browser_window_gtk.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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/notification_details.h" 42 #include "chrome/common/notification_details.h"
43 #include "chrome/common/notification_service.h" 43 #include "chrome/common/notification_service.h"
44 #include "chrome/common/notification_type.h" 44 #include "chrome/common/notification_type.h"
45 #include "chrome/common/pref_names.h" 45 #include "chrome/common/pref_names.h"
46 #include "chrome/common/url_constants.h" 46 #include "chrome/common/url_constants.h"
47 #include "gfx/canvas_skia_paint.h"
48 #include "gfx/gtk_util.h"
49 #include "gfx/skbitmap_operations.h"
50 #include "grit/chromium_strings.h" 47 #include "grit/chromium_strings.h"
51 #include "grit/generated_resources.h" 48 #include "grit/generated_resources.h"
52 #include "grit/theme_resources.h" 49 #include "grit/theme_resources.h"
53 #include "ui/base/dragdrop/gtk_dnd_util.h" 50 #include "ui/base/dragdrop/gtk_dnd_util.h"
54 #include "ui/base/l10n/l10n_util.h" 51 #include "ui/base/l10n/l10n_util.h"
55 #include "ui/base/models/accelerator_gtk.h" 52 #include "ui/base/models/accelerator_gtk.h"
53 #include "ui/gfx/canvas_skia_paint.h"
54 #include "ui/gfx/gtk_util.h"
55 #include "ui/gfx/skbitmap_operations.h"
56 56
57 namespace { 57 namespace {
58 58
59 // 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,
60 // etc.). 60 // etc.).
61 const int kToolbarLeftAreaPadding = 4; 61 const int kToolbarLeftAreaPadding = 4;
62 62
63 // Height of the toolbar in pixels (not counting padding). 63 // Height of the toolbar in pixels (not counting padding).
64 const int kToolbarHeight = 29; 64 const int kToolbarHeight = 29;
65 65
(...skipping 585 matching lines...) Expand 10 before | Expand all | Expand 10 after
651 int x_offset = base::i18n::IsRTL() ? 0 : 651 int x_offset = base::i18n::IsRTL() ? 0 :
652 sender->allocation.width - badge->width(); 652 sender->allocation.width - badge->width();
653 int y_offset = 0; 653 int y_offset = 0;
654 canvas.DrawBitmapInt( 654 canvas.DrawBitmapInt(
655 *badge, 655 *badge,
656 sender->allocation.x + x_offset, 656 sender->allocation.x + x_offset,
657 sender->allocation.y + y_offset); 657 sender->allocation.y + y_offset);
658 658
659 return FALSE; 659 return FALSE;
660 } 660 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/gtk/browser_titlebar.cc ('k') | chrome/browser/ui/gtk/browser_window_gtk.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698