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

Side by Side Diff: chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc

Issue 4710001: Split out command IDs from chrome_dll_resource.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 10 years, 1 month 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) 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/autocomplete/autocomplete_edit_view_gtk.h" 5 #include "chrome/browser/autocomplete/autocomplete_edit_view_gtk.h"
6 6
7 #include <gtk/gtk.h> 7 #include <gtk/gtk.h>
8 #include <gdk/gdkkeysyms.h> 8 #include <gdk/gdkkeysyms.h>
9 9
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/utf_string_conversions.h" 15 #include "base/utf_string_conversions.h"
16 #include "chrome/app/chrome_dll_resource.h" 16 #include "chrome/app/chrome_command_ids.h"
17 #include "chrome/browser/autocomplete/autocomplete_edit.h" 17 #include "chrome/browser/autocomplete/autocomplete_edit.h"
18 #include "chrome/browser/autocomplete/autocomplete_match.h" 18 #include "chrome/browser/autocomplete/autocomplete_match.h"
19 #include "chrome/browser/autocomplete/autocomplete_popup_model.h" 19 #include "chrome/browser/autocomplete/autocomplete_popup_model.h"
20 #include "chrome/browser/bookmarks/bookmark_drag_data.h" 20 #include "chrome/browser/bookmarks/bookmark_drag_data.h"
21 #include "chrome/browser/browser_process.h" 21 #include "chrome/browser/browser_process.h"
22 #include "chrome/browser/command_updater.h" 22 #include "chrome/browser/command_updater.h"
23 #include "chrome/browser/defaults.h" 23 #include "chrome/browser/defaults.h"
24 #include "chrome/browser/gtk/gtk_util.h" 24 #include "chrome/browser/gtk/gtk_util.h"
25 #include "chrome/browser/gtk/view_id_util.h" 25 #include "chrome/browser/gtk/view_id_util.h"
26 #include "chrome/browser/platform_util.h" 26 #include "chrome/browser/platform_util.h"
(...skipping 1892 matching lines...) Expand 10 before | Expand all | Expand 10 after
1919 // baseline, so we need to move the |instant_view_| down to make sure it 1919 // baseline, so we need to move the |instant_view_| down to make sure it
1920 // has the same baseline as the |text_view_|. 1920 // has the same baseline as the |text_view_|.
1921 PangoLayout* layout = gtk_label_get_layout(GTK_LABEL(instant_view_)); 1921 PangoLayout* layout = gtk_label_get_layout(GTK_LABEL(instant_view_));
1922 int height; 1922 int height;
1923 pango_layout_get_size(layout, NULL, &height); 1923 pango_layout_get_size(layout, NULL, &height);
1924 PangoLayoutIter* iter = pango_layout_get_iter(layout); 1924 PangoLayoutIter* iter = pango_layout_get_iter(layout);
1925 int baseline = pango_layout_iter_get_baseline(iter); 1925 int baseline = pango_layout_iter_get_baseline(iter);
1926 pango_layout_iter_free(iter); 1926 pango_layout_iter_free(iter);
1927 g_object_set(instant_anchor_tag_, "rise", baseline - height, NULL); 1927 g_object_set(instant_anchor_tag_, "rise", baseline - height, NULL);
1928 } 1928 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698