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

Unified Diff: chrome/browser/views/bookmark_editor_view.cc

Issue 1795007: Get rid of BookmarkEditor::Show()'s BookmarkEditor::Handler argument. (Closed)
Patch Set: baz Created 10 years, 8 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
Index: chrome/browser/views/bookmark_editor_view.cc
diff --git a/chrome/browser/views/bookmark_editor_view.cc b/chrome/browser/views/bookmark_editor_view.cc
index bd61ab3ef9735eb9046f060529b15539192109cd..28b98678b38939f156a29f86d0a18d32b41c6b8f 100644
--- a/chrome/browser/views/bookmark_editor_view.cc
+++ b/chrome/browser/views/bookmark_editor_view.cc
@@ -51,11 +51,10 @@ void BookmarkEditor::Show(HWND parent_hwnd,
Profile* profile,
const BookmarkNode* parent,
const EditDetails& details,
- Configuration configuration,
- Handler* handler) {
+ Configuration configuration) {
DCHECK(profile);
BookmarkEditorView* editor =
- new BookmarkEditorView(profile, parent, details, configuration, handler);
+ new BookmarkEditorView(profile, parent, details, configuration);
editor->Show(parent_hwnd);
}
@@ -63,8 +62,7 @@ BookmarkEditorView::BookmarkEditorView(
Profile* profile,
const BookmarkNode* parent,
const EditDetails& details,
- BookmarkEditor::Configuration configuration,
- BookmarkEditor::Handler* handler)
+ BookmarkEditor::Configuration configuration)
: profile_(profile),
tree_view_(NULL),
new_group_button_(NULL),
@@ -73,8 +71,7 @@ BookmarkEditorView::BookmarkEditorView(
parent_(parent),
details_(details),
running_menu_for_root_(false),
- show_tree_(configuration == SHOW_TREE),
- handler_(handler) {
+ show_tree_(configuration == SHOW_TREE) {
DCHECK(profile);
Init();
}
@@ -535,7 +532,7 @@ void BookmarkEditorView::ApplyEdits(EditorNode* parent) {
if (!show_tree_) {
bookmark_utils::ApplyEditsWithNoGroupChange(
- bb_model_, parent_, details_, new_title, new_url, handler_.get());
+ bb_model_, parent_, details_, new_title, new_url, NULL);
return;
}
@@ -545,7 +542,7 @@ void BookmarkEditorView::ApplyEdits(EditorNode* parent) {
bb_model_->root_node(), tree_model_->GetRoot(), parent, &new_parent);
bookmark_utils::ApplyEditsWithPossibleGroupChange(
- bb_model_, new_parent, details_, new_title, new_url, handler_.get());
+ bb_model_, new_parent, details_, new_title, new_url, NULL);
}
void BookmarkEditorView::ApplyNameChangesAndCreateNewGroups(

Powered by Google App Engine
This is Rietveld 408576698