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 eb001986ce1d5806aa02d454bc3f9001ea602f23..60d817955f9bd0288df2474552e72a23cae19f0c 100644 |
--- a/chrome/browser/views/bookmark_editor_view.cc |
+++ b/chrome/browser/views/bookmark_editor_view.cc |
@@ -42,11 +42,25 @@ static const int kTreeWidth = 300; |
// ID for various children. |
static const int kNewGroupButtonID = 1002; |
-BookmarkEditorView::BookmarkEditorView(Profile* profile, |
- BookmarkNode* parent, |
- BookmarkNode* node, |
- Configuration configuration, |
- Handler* handler) |
+// static |
+void BookmarkEditor::Show(HWND parent_hwnd, |
+ Profile* profile, |
+ BookmarkNode* parent, |
+ BookmarkNode* node, |
+ Configuration configuration, |
+ Handler* handler) { |
+ DCHECK(profile); |
+ BookmarkEditorView* editor = |
+ new BookmarkEditorView(profile, parent, node, configuration, handler); |
+ editor->Show(parent_hwnd); |
+} |
+ |
+BookmarkEditorView::BookmarkEditorView( |
+ Profile* profile, |
+ BookmarkNode* parent, |
+ BookmarkNode* node, |
+ BookmarkEditor::Configuration configuration, |
+ BookmarkEditor::Handler* handler) |
: profile_(profile), |
tree_view_(NULL), |
new_group_button_(NULL), |
@@ -67,19 +81,6 @@ BookmarkEditorView::~BookmarkEditorView() { |
bb_model_->RemoveObserver(this); |
} |
-// static |
-void BookmarkEditorView::Show(HWND parent_hwnd, |
- Profile* profile, |
- BookmarkNode* parent, |
- BookmarkNode* node, |
- Configuration configuration, |
- Handler* handler) { |
- DCHECK(profile); |
- BookmarkEditorView* editor = |
- new BookmarkEditorView(profile, parent, node, configuration, handler); |
- editor->Show(parent_hwnd); |
-} |
- |
bool BookmarkEditorView::IsDialogButtonEnabled( |
MessageBoxFlags::DialogButton button) const { |
if (button == MessageBoxFlags::DIALOGBUTTON_OK) { |
@@ -489,7 +490,7 @@ void BookmarkEditorView::ApplyEdits(EditorNode* parent) { |
BookmarkNode* old_parent = node_ ? node_->GetParent() : NULL; |
const int old_index = old_parent ? old_parent->IndexOfChild(node_) : -1; |
- if (!show_tree_ ) { |
+ if (!show_tree_) { |
if (!node_) { |
BookmarkNode* node = |
bb_model_->AddURL(parent_, parent_->GetChildCount(), new_title, |