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

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

Issue 16871010: Rewrite scoped_ptr<T>(NULL) to use the default ctor in chrome/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/ui/views/bookmarks/bookmark_editor_view.h" 5 #include "chrome/browser/ui/views/bookmarks/bookmark_editor_view.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 editor->Show(parent_window); 58 editor->Show(parent_window);
59 } 59 }
60 60
61 BookmarkEditorView::BookmarkEditorView( 61 BookmarkEditorView::BookmarkEditorView(
62 Profile* profile, 62 Profile* profile,
63 const BookmarkNode* parent, 63 const BookmarkNode* parent,
64 const EditDetails& details, 64 const EditDetails& details,
65 BookmarkEditor::Configuration configuration) 65 BookmarkEditor::Configuration configuration)
66 : profile_(profile), 66 : profile_(profile),
67 tree_view_(NULL), 67 tree_view_(NULL),
68 new_folder_button_(NULL),
69 url_label_(NULL), 68 url_label_(NULL),
70 url_tf_(NULL), 69 url_tf_(NULL),
71 title_label_(NULL), 70 title_label_(NULL),
72 title_tf_(NULL), 71 title_tf_(NULL),
73 parent_(parent), 72 parent_(parent),
74 details_(details), 73 details_(details),
75 running_menu_for_root_(false), 74 running_menu_for_root_(false),
76 show_tree_(configuration == SHOW_TREE) { 75 show_tree_(configuration == SHOW_TREE) {
77 DCHECK(profile); 76 DCHECK(profile);
78 Init(); 77 Init();
(...skipping 543 matching lines...) Expand 10 before | Expand all | Expand 10 after
622 IDS_BOOKMARK_EDITOR_NEW_FOLDER_MENU_ITEM); 621 IDS_BOOKMARK_EDITOR_NEW_FOLDER_MENU_ITEM);
623 } 622 }
624 return context_menu_model_.get(); 623 return context_menu_model_.get();
625 } 624 }
626 625
627 void BookmarkEditorView::EditorTreeModel::SetTitle(ui::TreeModelNode* node, 626 void BookmarkEditorView::EditorTreeModel::SetTitle(ui::TreeModelNode* node,
628 const string16& title) { 627 const string16& title) {
629 if (!title.empty()) 628 if (!title.empty())
630 ui::TreeNodeModel<EditorNode>::SetTitle(node, title); 629 ui::TreeNodeModel<EditorNode>::SetTitle(node, title);
631 } 630 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc ('k') | chrome/browser/ui/views/frame/browser_view_layout.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698