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

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

Issue 5606002: Move:... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years 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/gtk/browser_titlebar.cc ('k') | chrome/browser/gtk/browser_window_gtk.cc » ('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) 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 16 matching lines...) Expand all
27 #include "chrome/browser/gtk/gtk_chrome_button.h" 27 #include "chrome/browser/gtk/gtk_chrome_button.h"
28 #include "chrome/browser/gtk/gtk_theme_provider.h" 28 #include "chrome/browser/gtk/gtk_theme_provider.h"
29 #include "chrome/browser/gtk/gtk_util.h" 29 #include "chrome/browser/gtk/gtk_util.h"
30 #include "chrome/browser/gtk/location_bar_view_gtk.h" 30 #include "chrome/browser/gtk/location_bar_view_gtk.h"
31 #include "chrome/browser/gtk/reload_button_gtk.h" 31 #include "chrome/browser/gtk/reload_button_gtk.h"
32 #include "chrome/browser/gtk/rounded_window.h" 32 #include "chrome/browser/gtk/rounded_window.h"
33 #include "chrome/browser/gtk/tabs/tab_strip_gtk.h" 33 #include "chrome/browser/gtk/tabs/tab_strip_gtk.h"
34 #include "chrome/browser/gtk/view_id_util.h" 34 #include "chrome/browser/gtk/view_id_util.h"
35 #include "chrome/browser/net/url_fixer_upper.h" 35 #include "chrome/browser/net/url_fixer_upper.h"
36 #include "chrome/browser/prefs/pref_service.h" 36 #include "chrome/browser/prefs/pref_service.h"
37 #include "chrome/browser/profile.h" 37 #include "chrome/browser/profiles/profile.h"
38 #include "chrome/browser/tab_contents/tab_contents.h" 38 #include "chrome/browser/tab_contents/tab_contents.h"
39 #include "chrome/browser/themes/browser_theme_provider.h" 39 #include "chrome/browser/themes/browser_theme_provider.h"
40 #include "chrome/browser/ui/browser.h" 40 #include "chrome/browser/ui/browser.h"
41 #include "chrome/browser/ui/toolbar/encoding_menu_controller.h" 41 #include "chrome/browser/ui/toolbar/encoding_menu_controller.h"
42 #include "chrome/browser/upgrade_detector.h" 42 #include "chrome/browser/upgrade_detector.h"
43 #include "chrome/common/chrome_switches.h" 43 #include "chrome/common/chrome_switches.h"
44 #include "chrome/common/notification_details.h" 44 #include "chrome/common/notification_details.h"
45 #include "chrome/common/notification_service.h" 45 #include "chrome/common/notification_service.h"
46 #include "chrome/common/notification_type.h" 46 #include "chrome/common/notification_type.h"
47 #include "chrome/common/pref_names.h" 47 #include "chrome/common/pref_names.h"
(...skipping 589 matching lines...) Expand 10 before | Expand all | Expand 10 after
637 int x_offset = base::i18n::IsRTL() ? 0 : 637 int x_offset = base::i18n::IsRTL() ? 0 :
638 sender->allocation.width - badge.width(); 638 sender->allocation.width - badge.width();
639 int y_offset = 0; 639 int y_offset = 0;
640 canvas.DrawBitmapInt( 640 canvas.DrawBitmapInt(
641 badge, 641 badge,
642 sender->allocation.x + x_offset, 642 sender->allocation.x + x_offset,
643 sender->allocation.y + y_offset); 643 sender->allocation.y + y_offset);
644 644
645 return FALSE; 645 return FALSE;
646 } 646 }
OLDNEW
« no previous file with comments | « chrome/browser/gtk/browser_titlebar.cc ('k') | chrome/browser/gtk/browser_window_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698