OLD | NEW |
1 // Copyright (c) 2010 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/renderer_host/gtk_im_context_wrapper.h" | 5 #include "chrome/browser/renderer_host/gtk_im_context_wrapper.h" |
6 | 6 |
7 #include <gdk/gdk.h> | 7 #include <gdk/gdk.h> |
8 #include <gdk/gdkkeysyms.h> | 8 #include <gdk/gdkkeysyms.h> |
9 #include <gtk/gtk.h> | 9 #include <gtk/gtk.h> |
| 10 |
10 #include <algorithm> | 11 #include <algorithm> |
11 | 12 |
12 #include "app/l10n_util.h" | 13 #include "app/l10n_util.h" |
13 #include "base/logging.h" | 14 #include "base/logging.h" |
14 #include "base/string_util.h" | 15 #include "base/string_util.h" |
15 #include "base/third_party/icu/icu_utf.h" | 16 #include "base/third_party/icu/icu_utf.h" |
16 #include "base/utf_string_conversions.h" | 17 #include "base/utf_string_conversions.h" |
17 #include "chrome/app/chrome_command_ids.h" | 18 #include "chrome/app/chrome_command_ids.h" |
18 #include "chrome/browser/gtk/gtk_util.h" | 19 #include "chrome/browser/ui/gtk/gtk_util.h" |
19 #if !defined(TOOLKIT_VIEWS) | 20 #if !defined(TOOLKIT_VIEWS) |
20 #include "chrome/browser/gtk/menu_gtk.h" | 21 #include "chrome/browser/ui/gtk/menu_gtk.h" |
21 #endif | 22 #endif |
22 #include "chrome/browser/renderer_host/render_widget_host.h" | 23 #include "chrome/browser/renderer_host/render_widget_host.h" |
23 #include "chrome/browser/renderer_host/render_widget_host_view_gtk.h" | 24 #include "chrome/browser/renderer_host/render_widget_host_view_gtk.h" |
24 #include "chrome/common/native_web_keyboard_event.h" | 25 #include "chrome/common/native_web_keyboard_event.h" |
25 #include "chrome/common/render_messages.h" | 26 #include "chrome/common/render_messages.h" |
26 #include "gfx/gtk_util.h" | 27 #include "gfx/gtk_util.h" |
27 #include "gfx/rect.h" | 28 #include "gfx/rect.h" |
28 #include "grit/generated_resources.h" | 29 #include "grit/generated_resources.h" |
29 #include "third_party/skia/include/core/SkColor.h" | 30 #include "third_party/skia/include/core/SkColor.h" |
30 | 31 |
(...skipping 638 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
669 } while (pango_attr_iterator_next(iter)); | 670 } while (pango_attr_iterator_next(iter)); |
670 pango_attr_iterator_destroy(iter); | 671 pango_attr_iterator_destroy(iter); |
671 } | 672 } |
672 | 673 |
673 // Use a black thin underline by default. | 674 // Use a black thin underline by default. |
674 if (underlines->empty()) { | 675 if (underlines->empty()) { |
675 underlines->push_back( | 676 underlines->push_back( |
676 WebKit::WebCompositionUnderline(0, length, SK_ColorBLACK, false)); | 677 WebKit::WebCompositionUnderline(0, length, SK_ColorBLACK, false)); |
677 } | 678 } |
678 } | 679 } |
OLD | NEW |