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

Side by Side Diff: chrome/browser/ui/gtk/find_bar_gtk.cc

Issue 6901058: Increase infobar height and infobar button height for touch. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Undo inadvertant merge changes (hopefully). Created 9 years, 7 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/ui/gtk/find_bar_gtk.h" 5 #include "chrome/browser/ui/gtk/find_bar_gtk.h"
6 6
7 #include <gdk/gdkkeysyms.h> 7 #include <gdk/gdkkeysyms.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <string> 10 #include <string>
(...skipping 20 matching lines...) Expand all
31 #include "chrome/browser/ui/gtk/tab_contents_container_gtk.h" 31 #include "chrome/browser/ui/gtk/tab_contents_container_gtk.h"
32 #include "chrome/browser/ui/gtk/tabs/tab_strip_gtk.h" 32 #include "chrome/browser/ui/gtk/tabs/tab_strip_gtk.h"
33 #include "chrome/browser/ui/gtk/view_id_util.h" 33 #include "chrome/browser/ui/gtk/view_id_util.h"
34 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" 34 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
35 #include "content/browser/renderer_host/render_view_host.h" 35 #include "content/browser/renderer_host/render_view_host.h"
36 #include "content/browser/tab_contents/tab_contents.h" 36 #include "content/browser/tab_contents/tab_contents.h"
37 #include "content/common/native_web_keyboard_event.h" 37 #include "content/common/native_web_keyboard_event.h"
38 #include "content/common/notification_service.h" 38 #include "content/common/notification_service.h"
39 #include "grit/generated_resources.h" 39 #include "grit/generated_resources.h"
40 #include "grit/theme_resources.h" 40 #include "grit/theme_resources.h"
41 #include "grit/theme_resources_standard.h"
41 #include "ui/base/l10n/l10n_util.h" 42 #include "ui/base/l10n/l10n_util.h"
42 #include "ui/base/resource/resource_bundle.h" 43 #include "ui/base/resource/resource_bundle.h"
43 44
44 namespace { 45 namespace {
45 46
46 // Used as the color of the text in the entry box and the text for the results 47 // Used as the color of the text in the entry box and the text for the results
47 // label for failure searches. 48 // label for failure searches.
48 const GdkColor kEntryTextColor = gtk_util::kGdkBlack; 49 const GdkColor kEntryTextColor = gtk_util::kGdkBlack;
49 50
50 // Used as the color of the background of the entry box and the background of 51 // Used as the color of the background of the entry box and the background of
(...skipping 935 matching lines...) Expand 10 before | Expand all | Expand 10 after
986 987
987 // static 988 // static
988 gboolean FindBarGtk::OnFocusOut(GtkWidget* entry, GdkEventFocus* event, 989 gboolean FindBarGtk::OnFocusOut(GtkWidget* entry, GdkEventFocus* event,
989 FindBarGtk* find_bar) { 990 FindBarGtk* find_bar) {
990 g_signal_handlers_disconnect_by_func( 991 g_signal_handlers_disconnect_by_func(
991 gdk_keymap_get_for_display(gtk_widget_get_display(entry)), 992 gdk_keymap_get_for_display(gtk_widget_get_display(entry)),
992 reinterpret_cast<gpointer>(&OnKeymapDirectionChanged), find_bar); 993 reinterpret_cast<gpointer>(&OnKeymapDirectionChanged), find_bar);
993 994
994 return FALSE; // Continue propagation. 995 return FALSE; // Continue propagation.
995 } 996 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/gtk/download/download_shelf_gtk.cc ('k') | chrome/browser/ui/views/download/download_shelf_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698