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

Side by Side Diff: chrome/browser/autocomplete/autocomplete_edit_view_gtk.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/autocomplete/autocomplete_edit_view_gtk.h" 5 #include "chrome/browser/autocomplete/autocomplete_edit_view_gtk.h"
6 6
7 #include <gdk/gdkkeysyms.h> 7 #include <gdk/gdkkeysyms.h>
8 #include <gtk/gtk.h> 8 #include <gtk/gtk.h>
9 9
10 #include <algorithm> 10 #include <algorithm>
11 11
12 #include "base/logging.h" 12 #include "base/logging.h"
13 #include "base/string_util.h" 13 #include "base/string_util.h"
14 #include "base/utf_string_conversions.h" 14 #include "base/utf_string_conversions.h"
15 #include "chrome/app/chrome_command_ids.h" 15 #include "chrome/app/chrome_command_ids.h"
16 #include "chrome/browser/autocomplete/autocomplete_edit.h" 16 #include "chrome/browser/autocomplete/autocomplete_edit.h"
17 #include "chrome/browser/autocomplete/autocomplete_match.h" 17 #include "chrome/browser/autocomplete/autocomplete_match.h"
18 #include "chrome/browser/autocomplete/autocomplete_popup_model.h" 18 #include "chrome/browser/autocomplete/autocomplete_popup_model.h"
19 #include "chrome/browser/bookmarks/bookmark_node_data.h" 19 #include "chrome/browser/bookmarks/bookmark_node_data.h"
20 #include "chrome/browser/command_updater.h" 20 #include "chrome/browser/command_updater.h"
21 #include "chrome/browser/defaults.h" 21 #include "chrome/browser/defaults.h"
22 #include "chrome/browser/instant/instant_controller.h" 22 #include "chrome/browser/instant/instant_controller.h"
23 #include "chrome/browser/platform_util.h" 23 #include "chrome/browser/platform_util.h"
24 #include "chrome/browser/tab_contents/tab_contents.h" 24 #include "chrome/browser/tab_contents/tab_contents.h"
25 #include "chrome/browser/ui/gtk/gtk_util.h" 25 #include "chrome/browser/ui/gtk/gtk_util.h"
26 #include "chrome/browser/ui/gtk/view_id_util.h" 26 #include "chrome/browser/ui/gtk/view_id_util.h"
27 #include "chrome/browser/ui/toolbar/toolbar_model.h" 27 #include "chrome/browser/ui/toolbar/toolbar_model.h"
28 #include "chrome/common/notification_service.h" 28 #include "chrome/common/notification_service.h"
29 #include "gfx/color_utils.h"
30 #include "gfx/font.h"
31 #include "gfx/gtk_util.h"
32 #include "gfx/skia_utils_gtk.h"
33 #include "googleurl/src/gurl.h" 29 #include "googleurl/src/gurl.h"
34 #include "grit/generated_resources.h" 30 #include "grit/generated_resources.h"
35 #include "net/base/escape.h" 31 #include "net/base/escape.h"
36 #include "third_party/undoview/undo_view.h" 32 #include "third_party/undoview/undo_view.h"
37 #include "ui/base/animation/multi_animation.h" 33 #include "ui/base/animation/multi_animation.h"
38 #include "ui/base/l10n/l10n_util.h" 34 #include "ui/base/l10n/l10n_util.h"
39 #include "ui/base/resource/resource_bundle.h" 35 #include "ui/base/resource/resource_bundle.h"
36 #include "ui/gfx/color_utils.h"
37 #include "ui/gfx/font.h"
38 #include "ui/gfx/gtk_util.h"
39 #include "ui/gfx/skia_utils_gtk.h"
40 40
41 #if defined(TOOLKIT_VIEWS) 41 #if defined(TOOLKIT_VIEWS)
42 #include "chrome/browser/autocomplete/autocomplete_edit_view_views.h" 42 #include "chrome/browser/autocomplete/autocomplete_edit_view_views.h"
43 #include "chrome/browser/ui/gtk/accessible_widget_helper_gtk.h" 43 #include "chrome/browser/ui/gtk/accessible_widget_helper_gtk.h"
44 #include "chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view. h" 44 #include "chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view. h"
45 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" 45 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
46 #include "views/controls/textfield/native_textfield_views.h" 46 #include "views/controls/textfield/native_textfield_views.h"
47 #else 47 #else
48 #include "chrome/browser/autocomplete/autocomplete_popup_view_gtk.h" 48 #include "chrome/browser/autocomplete/autocomplete_popup_view_gtk.h"
49 #include "chrome/browser/ui/gtk/gtk_theme_provider.h" 49 #include "chrome/browser/ui/gtk/gtk_theme_provider.h"
(...skipping 2214 matching lines...) Expand 10 before | Expand all | Expand 10 after
2264 // baseline, so we need to move the |instant_view_| down to make sure it 2264 // baseline, so we need to move the |instant_view_| down to make sure it
2265 // has the same baseline as the |text_view_|. 2265 // has the same baseline as the |text_view_|.
2266 PangoLayout* layout = gtk_label_get_layout(GTK_LABEL(instant_view_)); 2266 PangoLayout* layout = gtk_label_get_layout(GTK_LABEL(instant_view_));
2267 int height; 2267 int height;
2268 pango_layout_get_size(layout, NULL, &height); 2268 pango_layout_get_size(layout, NULL, &height);
2269 PangoLayoutIter* iter = pango_layout_get_iter(layout); 2269 PangoLayoutIter* iter = pango_layout_get_iter(layout);
2270 int baseline = pango_layout_iter_get_baseline(iter); 2270 int baseline = pango_layout_iter_get_baseline(iter);
2271 pango_layout_iter_free(iter); 2271 pango_layout_iter_free(iter);
2272 g_object_set(instant_anchor_tag_, "rise", baseline - height, NULL); 2272 g_object_set(instant_anchor_tag_, "rise", baseline - height, NULL);
2273 } 2273 }
OLDNEW
« no previous file with comments | « chrome/browser/autocomplete/autocomplete_edit_view_gtk.h ('k') | chrome/browser/autocomplete/autocomplete_edit_view_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698