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

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

Issue 138363004: Views Textfield fixes and cleanup. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sync and rebase. Created 6 years, 11 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/edit_search_engine_dialog.h" 5 #include "chrome/browser/ui/gtk/edit_search_engine_dialog.h"
6 6
7 #include <gtk/gtk.h> 7 #include <gtk/gtk.h>
8 8
9 #include "base/i18n/case_conversion.h" 9 #include "base/i18n/case_conversion.h"
10 #include "base/i18n/rtl.h" 10 #include "base/i18n/rtl.h"
11 #include "base/message_loop/message_loop.h" 11 #include "base/message_loop/message_loop.h"
12 #include "base/strings/utf_string_conversions.h" 12 #include "base/strings/utf_string_conversions.h"
13 #include "chrome/browser/profiles/profile.h" 13 #include "chrome/browser/profiles/profile.h"
14 #include "chrome/browser/search_engines/template_url.h" 14 #include "chrome/browser/search_engines/template_url.h"
15 #include "chrome/browser/search_engines/template_url_service.h" 15 #include "chrome/browser/search_engines/template_url_service.h"
16 #include "chrome/browser/ui/gtk/gtk_util.h" 16 #include "chrome/browser/ui/gtk/gtk_util.h"
17 #include "chrome/browser/ui/search_engines/edit_search_engine_controller.h" 17 #include "chrome/browser/ui/search_engines/edit_search_engine_controller.h"
18 #include "chrome/common/net/url_fixer_upper.h" 18 #include "chrome/common/net/url_fixer_upper.h"
19 #include "grit/generated_resources.h" 19 #include "grit/generated_resources.h"
20 #include "grit/theme_resources.h" 20 #include "grit/theme_resources.h"
21 #include "grit/ui_resources.h" 21 #include "grit/ui_resources.h"
22 #include "ui/base/gtk/gtk_hig_constants.h" 22 #include "ui/base/gtk/gtk_hig_constants.h"
23 #include "ui/base/l10n/l10n_util.h" 23 #include "ui/base/l10n/l10n_util.h"
24 #include "ui/base/resource/resource_bundle.h" 24 #include "ui/base/resource/resource_bundle.h"
25 #include "ui/gfx/image/image.h" 25 #include "ui/gfx/image/image.h"
26 #include "url/gurl.h" 26 #include "url/gurl.h"
27 27
28 namespace { 28 namespace {
29 29
30 // Forces text to lowercase when connected to an editable's "insert-text" 30 // Forces lowercase text when connected to an editable's "insert-text" signal.
31 // signal. (Like views Textfield::STYLE_LOWERCASE.)
32 void LowercaseInsertTextHandler(GtkEditable *editable, const gchar *text, 31 void LowercaseInsertTextHandler(GtkEditable *editable, const gchar *text,
33 gint length, gint *position, gpointer data) { 32 gint length, gint *position, gpointer data) {
34 base::string16 original_text = base::UTF8ToUTF16(text); 33 base::string16 original_text = base::UTF8ToUTF16(text);
35 base::string16 lower_text = base::i18n::ToLower(original_text); 34 base::string16 lower_text = base::i18n::ToLower(original_text);
36 if (lower_text != original_text) { 35 if (lower_text != original_text) {
37 std::string result = base::UTF16ToUTF8(lower_text); 36 std::string result = base::UTF16ToUTF8(lower_text);
38 // Prevent ourselves getting called recursively about our own edit. 37 // Prevent ourselves getting called recursively about our own edit.
39 g_signal_handlers_block_by_func(G_OBJECT(editable), 38 g_signal_handlers_block_by_func(G_OBJECT(editable),
40 reinterpret_cast<gpointer>(LowercaseInsertTextHandler), data); 39 reinterpret_cast<gpointer>(LowercaseInsertTextHandler), data);
41 gtk_editable_insert_text(editable, result.c_str(), result.size(), position); 40 gtk_editable_insert_text(editable, result.c_str(), result.size(), position);
(...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after
267 GetURLInput()); 266 GetURLInput());
268 } else { 267 } else {
269 controller_->CleanUpCancelledAdd(); 268 controller_->CleanUpCancelledAdd();
270 } 269 }
271 gtk_widget_destroy(dialog_); 270 gtk_widget_destroy(dialog_);
272 } 271 }
273 272
274 void EditSearchEngineDialog::OnWindowDestroy(GtkWidget* widget) { 273 void EditSearchEngineDialog::OnWindowDestroy(GtkWidget* widget) {
275 base::MessageLoop::current()->DeleteSoon(FROM_HERE, this); 274 base::MessageLoop::current()->DeleteSoon(FROM_HERE, this);
276 } 275 }
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/options/wimax_config_view.cc ('k') | chrome/browser/ui/views/autofill/decorated_textfield.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698