diff options
| author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-19 17:33:04 +0000 |
|---|---|---|
| committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-19 17:33:04 +0000 |
| commit | da39555deba6de0aac412fbef519bbd6c8637d41 (patch) | |
| tree | bd0867ad486d560f94c85c78f82840f38c46c755 /chrome | |
| parent | c5866dca4988023e2a538be5c4feeeb52ae5fe80 (diff) | |
| download | chromium_src-da39555deba6de0aac412fbef519bbd6c8637d41.zip chromium_src-da39555deba6de0aac412fbef519bbd6c8637d41.tar.gz chromium_src-da39555deba6de0aac412fbef519bbd6c8637d41.tar.bz2 | |
Revert "Force the foreground and background color of the omnibox text."
This reverts commit r16383.
Session restore fails with this change.
TBR=willchan
Review URL: http://codereview.chromium.org/115519
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16387 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc b/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc index 725b0af..4e6be71 100644 --- a/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc +++ b/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc @@ -89,9 +89,6 @@ void AutocompleteEditViewGtk::Init() { text_view_ = gtk_text_view_new_with_buffer(text_buffer_); // Until we switch to vector graphics, force the font size. gtk_util::ForceFontSizePixels(text_view_, 13.4); // 13.4px == 10pt @ 96dpi - // Override the background color for now. http://crbug.com/12195 - gtk_widget_modify_base(text_view_, GTK_STATE_NORMAL, - &LocationBarViewGtk::kBackgroundColorByLevel[scheme_security_level_]); // The text view was floating. It will now be owned by the alignment. gtk_container_add(GTK_CONTAINER(alignment_.get()), text_view_); @@ -513,11 +510,6 @@ void AutocompleteEditViewGtk::EmphasizeURLComponents() { AutocompleteInput::Parse(text, model_->GetDesiredTLD(), &parts, NULL); bool emphasize = model_->CurrentTextIsURL() && (parts.host.len > 0); - // For now, force the text color to be black. Eventually, we should allow - // the user to override via gtk theming. http://crbug.com/12195 - static GtkTextTag* black_text = gtk_text_buffer_create_tag(text_buffer_, - NULL, "foreground", "#000000", NULL); - // Set the baseline emphasis. GtkTextIter start, end; gtk_text_buffer_get_bounds(text_buffer_, &start, &end); @@ -532,12 +524,7 @@ void AutocompleteEditViewGtk::EmphasizeURLComponents() { gtk_text_buffer_get_iter_at_line_index(text_buffer_, &end, 0, GetUTF8Offset(text, parts.host.end())); - // The following forces the text color to black. When we start obeying the - // user theme, we want to remove_all_tags (to get the user's default - // text color) rather than applying a color tag. http://crbug.com/12195 - gtk_text_buffer_apply_tag(text_buffer_, black_text, &start, &end); - } else { - gtk_text_buffer_apply_tag(text_buffer_, black_text, &start, &end); + gtk_text_buffer_remove_all_tags(text_buffer_, &start, &end); } // Emphasize the scheme for security UI display purposes (if necessary). |