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

Side by Side Diff: chrome/browser/views/bookmark_editor_view.cc

Issue 56053: URL's not properly unescaping when displayed (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: '' Created 11 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) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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/views/bookmark_editor_view.h" 5 #include "chrome/browser/views/bookmark_editor_view.h"
6 6
7 #include "app/l10n_util.h" 7 #include "app/l10n_util.h"
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/string_util.h" 10 #include "base/string_util.h"
(...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after
250 title_tf_.SetController(this); 250 title_tf_.SetController(this);
251 251
252 std::wstring url_text; 252 std::wstring url_text;
253 if (node_) { 253 if (node_) {
254 std::wstring languages = profile_ 254 std::wstring languages = profile_
255 ? profile_->GetPrefs()->GetString(prefs::kAcceptLanguages) 255 ? profile_->GetPrefs()->GetString(prefs::kAcceptLanguages)
256 : std::wstring(); 256 : std::wstring();
257 // The following URL is user-editable. We specify omit_username_password= 257 // The following URL is user-editable. We specify omit_username_password=
258 // false and unescape=false to show the original URL except IDN. 258 // false and unescape=false to show the original URL except IDN.
259 url_text = 259 url_text =
260 net::FormatUrl(node_->GetURL(), languages, false, false, NULL, NULL); 260 net::FormatUrl(node_->GetURL(), languages, false, UnescapeRule::NONE,
261 NULL, NULL);
261 } 262 }
262 url_tf_.SetText(url_text); 263 url_tf_.SetText(url_text);
263 url_tf_.SetController(this); 264 url_tf_.SetController(this);
264 265
265 if (show_tree_) { 266 if (show_tree_) {
266 tree_view_ = new views::TreeView(); 267 tree_view_ = new views::TreeView();
267 new_group_button_.reset(new views::NativeButton( 268 new_group_button_.reset(new views::NativeButton(
268 this, l10n_util::GetString(IDS_BOOMARK_EDITOR_NEW_FOLDER_BUTTON))); 269 this, l10n_util::GetString(IDS_BOOMARK_EDITOR_NEW_FOLDER_BUTTON)));
269 new_group_button_->SetParentOwned(false); 270 new_group_button_->SetParentOwned(false);
270 tree_view_->SetContextMenuController(this); 271 tree_view_->SetContextMenuController(this);
(...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after
538 break; 539 break;
539 } 540 }
540 } 541 }
541 DCHECK(child_bb_node); 542 DCHECK(child_bb_node);
542 bb_model_->SetTitle(child_bb_node, child_b_node->GetTitle()); 543 bb_model_->SetTitle(child_bb_node, child_b_node->GetTitle());
543 } 544 }
544 ApplyNameChangesAndCreateNewGroups(child_bb_node, child_b_node, 545 ApplyNameChangesAndCreateNewGroups(child_bb_node, child_b_node,
545 parent_b_node, parent_bb_node); 546 parent_b_node, parent_bb_node);
546 } 547 }
547 } 548 }
OLDNEW
« no previous file with comments | « chrome/browser/tab_contents/render_view_context_menu.cc ('k') | chrome/browser/views/shelf_item_dialog.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698