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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/search_engines/keyword_editor_controller.cc

Issue 9965143: Revert 130431 - Move the URL string from TemplateURLRef onto the owning TemplateURL. This will mak… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/search_engines/edit_search_engine_controller.cc ('k') | chrome/browser/ui/search_engines/keyword_editor_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/search_engines/keyword_editor_controller.cc
===================================================================
--- chrome/browser/ui/search_engines/keyword_editor_controller.cc (revision 130565)
+++ chrome/browser/ui/search_engines/keyword_editor_controller.cc (working copy)
@@ -63,7 +63,10 @@
// Don't do anything if the entry didn't change.
if ((template_url->short_name() == title) &&
- (template_url->keyword() == keyword) && (template_url->url() == url))
+ (template_url->keyword() == keyword) &&
+ ((url.empty() && !template_url->url()) ||
+ (!url.empty() && template_url->url() &&
+ template_url->url()->url() == url)))
return;
table_model_->ModifyTemplateURL(index, title, keyword, url);
« no previous file with comments | « chrome/browser/ui/search_engines/edit_search_engine_controller.cc ('k') | chrome/browser/ui/search_engines/keyword_editor_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698