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/omnibox/omnibox_popup_view_gtk.h" | 5 #include "chrome/browser/ui/gtk/omnibox/omnibox_popup_view_gtk.h" |
6 | 6 |
7 #include <gtk/gtk.h> | 7 #include <gtk/gtk.h> |
8 | 8 |
9 #include <algorithm> | 9 #include <algorithm> |
10 #include <string> | 10 #include <string> |
(...skipping 10 matching lines...) Expand all Loading... |
21 #include "chrome/browser/defaults.h" | 21 #include "chrome/browser/defaults.h" |
22 #include "chrome/browser/profiles/profile.h" | 22 #include "chrome/browser/profiles/profile.h" |
23 #include "chrome/browser/search_engines/template_url.h" | 23 #include "chrome/browser/search_engines/template_url.h" |
24 #include "chrome/browser/search_engines/template_url_service.h" | 24 #include "chrome/browser/search_engines/template_url_service.h" |
25 #include "chrome/browser/ui/gtk/gtk_theme_service.h" | 25 #include "chrome/browser/ui/gtk/gtk_theme_service.h" |
26 #include "chrome/browser/ui/gtk/gtk_util.h" | 26 #include "chrome/browser/ui/gtk/gtk_util.h" |
27 #include "chrome/browser/ui/omnibox/omnibox_view.h" | 27 #include "chrome/browser/ui/omnibox/omnibox_view.h" |
28 #include "chrome/common/chrome_notification_types.h" | 28 #include "chrome/common/chrome_notification_types.h" |
29 #include "content/common/notification_service.h" | 29 #include "content/common/notification_service.h" |
30 #include "grit/theme_resources.h" | 30 #include "grit/theme_resources.h" |
| 31 #include "ui/base/gtk/gtk_hig_constants.h" |
31 #include "ui/base/gtk/gtk_windowing.h" | 32 #include "ui/base/gtk/gtk_windowing.h" |
32 #include "ui/gfx/color_utils.h" | 33 #include "ui/gfx/color_utils.h" |
33 #include "ui/gfx/font.h" | 34 #include "ui/gfx/font.h" |
34 #include "ui/gfx/gtk_util.h" | 35 #include "ui/gfx/gtk_util.h" |
35 #include "ui/gfx/rect.h" | 36 #include "ui/gfx/rect.h" |
36 #include "ui/gfx/skia_utils_gtk.h" | 37 #include "ui/gfx/skia_utils_gtk.h" |
37 | 38 |
38 namespace { | 39 namespace { |
39 | 40 |
40 const GdkColor kBorderColor = GDK_COLOR_RGB(0xc7, 0xca, 0xce); | 41 const GdkColor kBorderColor = GDK_COLOR_RGB(0xc7, 0xca, 0xce); |
(...skipping 639 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
680 (text_width - actual_content_width - | 681 (text_width - actual_content_width - |
681 (actual_description_width / PANGO_SCALE)), | 682 (actual_description_width / PANGO_SCALE)), |
682 content_y, layout_); | 683 content_y, layout_); |
683 } | 684 } |
684 } | 685 } |
685 | 686 |
686 g_object_unref(gc); | 687 g_object_unref(gc); |
687 | 688 |
688 return TRUE; | 689 return TRUE; |
689 } | 690 } |
OLD | NEW |