| OLD | NEW |
| 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/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 #include <algorithm> | 10 #include <algorithm> |
| 11 | 11 |
| 12 #include "app/l10n_util.h" | 12 #include "app/l10n_util.h" |
| 13 #include "base/logging.h" | 13 #include "base/logging.h" |
| 14 #include "base/string_util.h" | 14 #include "base/string_util.h" |
| 15 #include "base/third_party/icu/icu_utf.h" | 15 #include "base/third_party/icu/icu_utf.h" |
| 16 #include "base/utf_string_conversions.h" | 16 #include "base/utf_string_conversions.h" |
| 17 #include "chrome/app/chrome_dll_resource.h" | 17 #include "chrome/app/chrome_command_ids.h" |
| 18 #include "chrome/browser/gtk/gtk_util.h" | 18 #include "chrome/browser/gtk/gtk_util.h" |
| 19 #if !defined(TOOLKIT_VIEWS) | 19 #if !defined(TOOLKIT_VIEWS) |
| 20 #include "chrome/browser/gtk/menu_gtk.h" | 20 #include "chrome/browser/gtk/menu_gtk.h" |
| 21 #endif | 21 #endif |
| 22 #include "chrome/browser/renderer_host/render_widget_host.h" | 22 #include "chrome/browser/renderer_host/render_widget_host.h" |
| 23 #include "chrome/browser/renderer_host/render_widget_host_view_gtk.h" | 23 #include "chrome/browser/renderer_host/render_widget_host_view_gtk.h" |
| 24 #include "chrome/common/native_web_keyboard_event.h" | 24 #include "chrome/common/native_web_keyboard_event.h" |
| 25 #include "chrome/common/render_messages.h" | 25 #include "chrome/common/render_messages.h" |
| 26 #include "gfx/gtk_util.h" | 26 #include "gfx/gtk_util.h" |
| 27 #include "gfx/rect.h" | 27 #include "gfx/rect.h" |
| (...skipping 616 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 644 } while (pango_attr_iterator_next(iter)); | 644 } while (pango_attr_iterator_next(iter)); |
| 645 pango_attr_iterator_destroy(iter); | 645 pango_attr_iterator_destroy(iter); |
| 646 } | 646 } |
| 647 | 647 |
| 648 // Use a black thin underline by default. | 648 // Use a black thin underline by default. |
| 649 if (underlines->empty()) { | 649 if (underlines->empty()) { |
| 650 underlines->push_back( | 650 underlines->push_back( |
| 651 WebKit::WebCompositionUnderline(0, length, SK_ColorBLACK, false)); | 651 WebKit::WebCompositionUnderline(0, length, SK_ColorBLACK, false)); |
| 652 } | 652 } |
| 653 } | 653 } |
| OLD | NEW |