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

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

Issue 865163003: bookmarks: Move BookmarkNode into 'bookmarks' namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: enhanced_bookmarks fix Created 5 years, 10 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
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 22 matching lines...) Expand all
33 #include "ui/views/controls/tree/tree_view.h" 33 #include "ui/views/controls/tree/tree_view.h"
34 #include "ui/views/focus/focus_manager.h" 34 #include "ui/views/focus/focus_manager.h"
35 #include "ui/views/layout/grid_layout.h" 35 #include "ui/views/layout/grid_layout.h"
36 #include "ui/views/layout/layout_constants.h" 36 #include "ui/views/layout/layout_constants.h"
37 #include "ui/views/widget/widget.h" 37 #include "ui/views/widget/widget.h"
38 #include "ui/views/window/dialog_client_view.h" 38 #include "ui/views/window/dialog_client_view.h"
39 #include "url/gurl.h" 39 #include "url/gurl.h"
40 40
41 using bookmarks::BookmarkExpandedStateTracker; 41 using bookmarks::BookmarkExpandedStateTracker;
42 using bookmarks::BookmarkModel; 42 using bookmarks::BookmarkModel;
43 using bookmarks::BookmarkNode;
43 using views::GridLayout; 44 using views::GridLayout;
44 45
45 namespace { 46 namespace {
46 47
47 // Background color of text field when URL is invalid. 48 // Background color of text field when URL is invalid.
48 const SkColor kErrorColor = SkColorSetRGB(0xFF, 0xBC, 0xBC); 49 const SkColor kErrorColor = SkColorSetRGB(0xFF, 0xBC, 0xBC);
49 50
50 } // namespace 51 } // namespace
51 52
52 // static 53 // static
(...skipping 592 matching lines...) Expand 10 before | Expand all | Expand 10 after
645 } 646 }
646 return context_menu_model_.get(); 647 return context_menu_model_.get();
647 } 648 }
648 649
649 void BookmarkEditorView::EditorTreeModel::SetTitle( 650 void BookmarkEditorView::EditorTreeModel::SetTitle(
650 ui::TreeModelNode* node, 651 ui::TreeModelNode* node,
651 const base::string16& title) { 652 const base::string16& title) {
652 if (!title.empty()) 653 if (!title.empty())
653 ui::TreeNodeModel<EditorNode>::SetTitle(node, title); 654 ui::TreeNodeModel<EditorNode>::SetTitle(node, title);
654 } 655 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698