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

Side by Side Diff: chrome/browser/renderer_host/gtk_im_context_wrapper.cc

Issue 6312156: Change includes of gfx/* to ui/gfx/* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 10 months 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
OLDNEW
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/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
11 #include <algorithm> 11 #include <algorithm>
12 12
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_command_ids.h" 17 #include "chrome/app/chrome_command_ids.h"
18 #include "chrome/browser/ui/gtk/gtk_util.h" 18 #include "chrome/browser/ui/gtk/gtk_util.h"
19 #if !defined(TOOLKIT_VIEWS) 19 #if !defined(TOOLKIT_VIEWS)
20 #include "chrome/browser/ui/gtk/menu_gtk.h" 20 #include "chrome/browser/ui/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"
27 #include "gfx/rect.h"
28 #include "grit/generated_resources.h" 26 #include "grit/generated_resources.h"
29 #include "third_party/skia/include/core/SkColor.h" 27 #include "third_party/skia/include/core/SkColor.h"
30 #include "ui/base/l10n/l10n_util.h" 28 #include "ui/base/l10n/l10n_util.h"
29 #include "ui/gfx/gtk_util.h"
30 #include "ui/gfx/rect.h"
31 31
32 namespace { 32 namespace {
33 // Copied from third_party/WebKit/Source/WebCore/page/EventHandler.cpp 33 // Copied from third_party/WebKit/Source/WebCore/page/EventHandler.cpp
34 // 34 //
35 // Match key code of composition keydown event on windows. 35 // Match key code of composition keydown event on windows.
36 // IE sends VK_PROCESSKEY which has value 229; 36 // IE sends VK_PROCESSKEY which has value 229;
37 // 37 //
38 // Please refer to following documents for detals: 38 // Please refer to following documents for detals:
39 // - Virtual-Key Codes 39 // - Virtual-Key Codes
40 // http://msdn.microsoft.com/en-us/library/ms645540(VS.85).aspx 40 // http://msdn.microsoft.com/en-us/library/ms645540(VS.85).aspx
(...skipping 661 matching lines...) Expand 10 before | Expand all | Expand 10 after
702 } while (pango_attr_iterator_next(iter)); 702 } while (pango_attr_iterator_next(iter));
703 pango_attr_iterator_destroy(iter); 703 pango_attr_iterator_destroy(iter);
704 } 704 }
705 705
706 // Use a black thin underline by default. 706 // Use a black thin underline by default.
707 if (underlines->empty()) { 707 if (underlines->empty()) {
708 underlines->push_back( 708 underlines->push_back(
709 WebKit::WebCompositionUnderline(0, length, SK_ColorBLACK, false)); 709 WebKit::WebCompositionUnderline(0, length, SK_ColorBLACK, false));
710 } 710 }
711 } 711 }
OLDNEW
« no previous file with comments | « chrome/browser/renderer_host/backing_store_x.cc ('k') | chrome/browser/renderer_host/render_message_filter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698