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

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

Issue 2830012: Cleanup: Remove some unneeded WebKit headers. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 10 years, 6 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) 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/gtk/find_bar_gtk.h" 5 #include "chrome/browser/gtk/find_bar_gtk.h"
6 6
7 #include <gdk/gdkkeysyms.h> 7 #include <gdk/gdkkeysyms.h>
8 8
9 #include <algorithm>
10 #include <string>
11 #include <vector>
12
9 #include "app/l10n_util.h" 13 #include "app/l10n_util.h"
10 #include "app/resource_bundle.h" 14 #include "app/resource_bundle.h"
11 #include "base/i18n/rtl.h" 15 #include "base/i18n/rtl.h"
12 #include "base/string_util.h" 16 #include "base/string_util.h"
13 #include "chrome/browser/browser.h" 17 #include "chrome/browser/browser.h"
14 #include "chrome/browser/find_bar_controller.h" 18 #include "chrome/browser/find_bar_controller.h"
15 #include "chrome/browser/find_bar_state.h" 19 #include "chrome/browser/find_bar_state.h"
16 #include "chrome/browser/gtk/browser_window_gtk.h" 20 #include "chrome/browser/gtk/browser_window_gtk.h"
17 #include "chrome/browser/gtk/cairo_cached_surface.h" 21 #include "chrome/browser/gtk/cairo_cached_surface.h"
18 #include "chrome/browser/gtk/custom_button.h" 22 #include "chrome/browser/gtk/custom_button.h"
19 #include "chrome/browser/gtk/gtk_floating_container.h" 23 #include "chrome/browser/gtk/gtk_floating_container.h"
20 #include "chrome/browser/gtk/gtk_theme_provider.h" 24 #include "chrome/browser/gtk/gtk_theme_provider.h"
21 #include "chrome/browser/gtk/gtk_util.h" 25 #include "chrome/browser/gtk/gtk_util.h"
22 #include "chrome/browser/gtk/nine_box.h" 26 #include "chrome/browser/gtk/nine_box.h"
23 #include "chrome/browser/gtk/slide_animator_gtk.h" 27 #include "chrome/browser/gtk/slide_animator_gtk.h"
24 #include "chrome/browser/gtk/tab_contents_container_gtk.h" 28 #include "chrome/browser/gtk/tab_contents_container_gtk.h"
25 #include "chrome/browser/gtk/tabs/tab_strip_gtk.h" 29 #include "chrome/browser/gtk/tabs/tab_strip_gtk.h"
26 #include "chrome/browser/gtk/view_id_util.h" 30 #include "chrome/browser/gtk/view_id_util.h"
27 #include "chrome/browser/profile.h" 31 #include "chrome/browser/profile.h"
28 #include "chrome/browser/renderer_host/render_view_host.h" 32 #include "chrome/browser/renderer_host/render_view_host.h"
29 #include "chrome/browser/tab_contents/tab_contents.h" 33 #include "chrome/browser/tab_contents/tab_contents.h"
30 #include "chrome/common/notification_service.h" 34 #include "chrome/common/notification_service.h"
31 #include "gfx/gtk_util.h" 35 #include "gfx/gtk_util.h"
32 #include "grit/generated_resources.h" 36 #include "grit/generated_resources.h"
33 #include "grit/theme_resources.h" 37 #include "grit/theme_resources.h"
34 #include "third_party/WebKit/WebKit/chromium/public/gtk/WebInputEventFactory.h"
35 38
36 namespace { 39 namespace {
37 40
38 // Used as the color of the text in the entry box and the text for the results 41 // Used as the color of the text in the entry box and the text for the results
39 // label for failure searches. 42 // label for failure searches.
40 const GdkColor kEntryTextColor = gfx::kGdkBlack; 43 const GdkColor kEntryTextColor = gfx::kGdkBlack;
41 44
42 // Used as the color of the background of the entry box and the background of 45 // Used as the color of the background of the entry box and the background of
43 // the find label for successful searches. 46 // the find label for successful searches.
44 const GdkColor kEntryBackgroundColor = gfx::kGdkWhite; 47 const GdkColor kEntryBackgroundColor = gfx::kGdkWhite;
(...skipping 909 matching lines...) Expand 10 before | Expand all | Expand 10 after
954 957
955 // static 958 // static
956 gboolean FindBarGtk::OnFocusOut(GtkWidget* entry, GdkEventFocus* event, 959 gboolean FindBarGtk::OnFocusOut(GtkWidget* entry, GdkEventFocus* event,
957 FindBarGtk* find_bar) { 960 FindBarGtk* find_bar) {
958 g_signal_handlers_disconnect_by_func( 961 g_signal_handlers_disconnect_by_func(
959 gdk_keymap_get_for_display(gtk_widget_get_display(entry)), 962 gdk_keymap_get_for_display(gtk_widget_get_display(entry)),
960 reinterpret_cast<gpointer>(&OnKeymapDirectionChanged), find_bar); 963 reinterpret_cast<gpointer>(&OnKeymapDirectionChanged), find_bar);
961 964
962 return FALSE; // Continue propagation. 965 return FALSE; // Continue propagation.
963 } 966 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698