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

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

Issue 284893003: Move bookmarks/core/... to bookmarks/... (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixing errors reported by presubmit Created 6 years, 7 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"
11 #include "base/prefs/pref_service.h" 11 #include "base/prefs/pref_service.h"
12 #include "base/strings/string_util.h" 12 #include "base/strings/string_util.h"
13 #include "base/strings/utf_string_conversions.h" 13 #include "base/strings/utf_string_conversions.h"
14 #include "chrome/browser/bookmarks/bookmark_model_factory.h" 14 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
15 #include "chrome/browser/history/history_service.h" 15 #include "chrome/browser/history/history_service.h"
16 #include "chrome/browser/profiles/profile.h" 16 #include "chrome/browser/profiles/profile.h"
17 #include "chrome/browser/ui/bookmarks/bookmark_utils.h" 17 #include "chrome/browser/ui/bookmarks/bookmark_utils.h"
18 #include "chrome/browser/ui/views/constrained_window_views.h" 18 #include "chrome/browser/ui/views/constrained_window_views.h"
19 #include "chrome/common/net/url_fixer_upper.h" 19 #include "chrome/common/net/url_fixer_upper.h"
20 #include "components/bookmarks/core/browser/bookmark_model.h" 20 #include "components/bookmarks/browser/bookmark_model.h"
21 #include "components/bookmarks/core/browser/bookmark_utils.h" 21 #include "components/bookmarks/browser/bookmark_utils.h"
22 #include "components/user_prefs/user_prefs.h" 22 #include "components/user_prefs/user_prefs.h"
23 #include "grit/chromium_strings.h" 23 #include "grit/chromium_strings.h"
24 #include "grit/generated_resources.h" 24 #include "grit/generated_resources.h"
25 #include "grit/locale_settings.h" 25 #include "grit/locale_settings.h"
26 #include "ui/accessibility/ax_view_state.h" 26 #include "ui/accessibility/ax_view_state.h"
27 #include "ui/base/l10n/l10n_util.h" 27 #include "ui/base/l10n/l10n_util.h"
28 #include "ui/events/event.h" 28 #include "ui/events/event.h"
29 #include "ui/views/background.h" 29 #include "ui/views/background.h"
30 #include "ui/views/controls/button/label_button.h" 30 #include "ui/views/controls/button/label_button.h"
31 #include "ui/views/controls/label.h" 31 #include "ui/views/controls/label.h"
(...skipping 603 matching lines...) Expand 10 before | Expand all | Expand 10 after
635 } 635 }
636 return context_menu_model_.get(); 636 return context_menu_model_.get();
637 } 637 }
638 638
639 void BookmarkEditorView::EditorTreeModel::SetTitle( 639 void BookmarkEditorView::EditorTreeModel::SetTitle(
640 ui::TreeModelNode* node, 640 ui::TreeModelNode* node,
641 const base::string16& title) { 641 const base::string16& title) {
642 if (!title.empty()) 642 if (!title.empty())
643 ui::TreeNodeModel<EditorNode>::SetTitle(node, title); 643 ui::TreeNodeModel<EditorNode>::SetTitle(node, title);
644 } 644 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698