OLD | NEW |
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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/bookmark_bar_gtk.h" | 5 #include "chrome/browser/gtk/bookmark_bar_gtk.h" |
6 | 6 |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include "app/gfx/text_elider.h" | 9 #include "app/gfx/text_elider.h" |
10 #include "app/l10n_util.h" | 10 #include "app/l10n_util.h" |
(...skipping 19 matching lines...) Expand all Loading... |
30 #include "chrome/common/gtk_util.h" | 30 #include "chrome/common/gtk_util.h" |
31 #include "chrome/common/pref_names.h" | 31 #include "chrome/common/pref_names.h" |
32 #include "chrome/common/pref_service.h" | 32 #include "chrome/common/pref_service.h" |
33 #include "grit/app_resources.h" | 33 #include "grit/app_resources.h" |
34 #include "grit/generated_resources.h" | 34 #include "grit/generated_resources.h" |
35 #include "grit/theme_resources.h" | 35 #include "grit/theme_resources.h" |
36 | 36 |
37 namespace { | 37 namespace { |
38 | 38 |
39 // The height of the bar. | 39 // The height of the bar. |
40 const int kBookmarkBarHeight = 33; | 40 const int kBookmarkBarHeight = 29; |
41 | 41 |
42 // Left-padding for the instructional text. | 42 // Left-padding for the instructional text. |
43 const int kInstructionsPadding = 6; | 43 const int kInstructionsPadding = 6; |
44 | 44 |
45 // Color of the instructional text. | 45 // Color of the instructional text. |
46 const GdkColor kInstructionsColor = GDK_COLOR_RGB(128, 128, 142); | 46 const GdkColor kInstructionsColor = GDK_COLOR_RGB(128, 128, 142); |
47 | 47 |
48 } // namespace | 48 } // namespace |
49 | 49 |
50 BookmarkBarGtk::BookmarkBarGtk(Profile* profile, Browser* browser, | 50 BookmarkBarGtk::BookmarkBarGtk(Profile* profile, Browser* browser, |
(...skipping 695 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
746 bar->InitBackground(); | 746 bar->InitBackground(); |
747 gfx::Point tabstrip_origin = | 747 gfx::Point tabstrip_origin = |
748 bar->window_->tabstrip()->GetTabStripOriginForWidget(widget); | 748 bar->window_->tabstrip()->GetTabStripOriginForWidget(widget); |
749 bar->background_ninebox_->RenderTopCenterStrip( | 749 bar->background_ninebox_->RenderTopCenterStrip( |
750 cr, tabstrip_origin.x(), tabstrip_origin.y(), | 750 cr, tabstrip_origin.x(), tabstrip_origin.y(), |
751 event->area.x + event->area.width - tabstrip_origin.x()); | 751 event->area.x + event->area.width - tabstrip_origin.x()); |
752 cairo_destroy(cr); | 752 cairo_destroy(cr); |
753 | 753 |
754 return FALSE; // Propagate expose to children. | 754 return FALSE; // Propagate expose to children. |
755 } | 755 } |
OLD | NEW |