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

Side by Side Diff: chrome/browser/ui/webui/md_bookmarks/md_bookmarks_ui.cc

Issue 2615673003: [MD WebUI] Move icons used in Bookmarks and Settings to shared file. (Closed)
Patch Set: reorder some icons Created 3 years, 11 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) 2016 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2016 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/webui/md_bookmarks/md_bookmarks_ui.h" 5 #include "chrome/browser/ui/webui/md_bookmarks/md_bookmarks_ui.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/strings/string16.h" 9 #include "base/strings/string16.h"
10 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 IDS_BOOKMARK_MANAGER_SEARCH_BUTTON); 51 IDS_BOOKMARK_MANAGER_SEARCH_BUTTON);
52 AddLocalizedString(source, "title", IDS_MD_BOOKMARK_MANAGER_TITLE); 52 AddLocalizedString(source, "title", IDS_MD_BOOKMARK_MANAGER_TITLE);
53 53
54 // Resources. 54 // Resources.
55 source->AddResourcePath("app.html", IDR_MD_BOOKMARKS_APP_HTML); 55 source->AddResourcePath("app.html", IDR_MD_BOOKMARKS_APP_HTML);
56 source->AddResourcePath("app.js", IDR_MD_BOOKMARKS_APP_JS); 56 source->AddResourcePath("app.js", IDR_MD_BOOKMARKS_APP_JS);
57 source->AddResourcePath("folder_node.html", 57 source->AddResourcePath("folder_node.html",
58 IDR_MD_BOOKMARKS_FOLDER_NODE_HTML); 58 IDR_MD_BOOKMARKS_FOLDER_NODE_HTML);
59 source->AddResourcePath("folder_node.js", 59 source->AddResourcePath("folder_node.js",
60 IDR_MD_BOOKMARKS_FOLDER_NODE_JS); 60 IDR_MD_BOOKMARKS_FOLDER_NODE_JS);
61 source->AddResourcePath("icons.html", IDR_MD_BOOKMARKS_ICONS_HTML);
62 source->AddResourcePath("item.html", IDR_MD_BOOKMARKS_ITEM_HTML); 61 source->AddResourcePath("item.html", IDR_MD_BOOKMARKS_ITEM_HTML);
63 source->AddResourcePath("item.js", IDR_MD_BOOKMARKS_ITEM_JS); 62 source->AddResourcePath("item.js", IDR_MD_BOOKMARKS_ITEM_JS);
64 source->AddResourcePath("list.html", IDR_MD_BOOKMARKS_LIST_HTML); 63 source->AddResourcePath("list.html", IDR_MD_BOOKMARKS_LIST_HTML);
65 source->AddResourcePath("list.js", IDR_MD_BOOKMARKS_LIST_JS); 64 source->AddResourcePath("list.js", IDR_MD_BOOKMARKS_LIST_JS);
66 source->AddResourcePath("shared_style.html", 65 source->AddResourcePath("shared_style.html",
67 IDR_MD_BOOKMARKS_SHARED_STYLE_HTML); 66 IDR_MD_BOOKMARKS_SHARED_STYLE_HTML);
68 source->AddResourcePath("shared_vars.html", 67 source->AddResourcePath("shared_vars.html",
69 IDR_MD_BOOKMARKS_SHARED_VARS_HTML); 68 IDR_MD_BOOKMARKS_SHARED_VARS_HTML);
70 source->AddResourcePath("sidebar.html", IDR_MD_BOOKMARKS_SIDEBAR_HTML); 69 source->AddResourcePath("sidebar.html", IDR_MD_BOOKMARKS_SIDEBAR_HTML);
71 source->AddResourcePath("sidebar.js", IDR_MD_BOOKMARKS_SIDEBAR_JS); 70 source->AddResourcePath("sidebar.js", IDR_MD_BOOKMARKS_SIDEBAR_JS);
(...skipping 13 matching lines...) Expand all
85 // Set up the chrome://bookmarks/ source. 84 // Set up the chrome://bookmarks/ source.
86 Profile* profile = Profile::FromWebUI(web_ui); 85 Profile* profile = Profile::FromWebUI(web_ui);
87 content::WebUIDataSource::Add(profile, 86 content::WebUIDataSource::Add(profile,
88 CreateMdBookmarksUIHTMLSource(profile)); 87 CreateMdBookmarksUIHTMLSource(profile));
89 } 88 }
90 89
91 // static 90 // static
92 bool MdBookmarksUI::IsEnabled() { 91 bool MdBookmarksUI::IsEnabled() {
93 return base::FeatureList::IsEnabled(features::kMaterialDesignBookmarks); 92 return base::FeatureList::IsEnabled(features::kMaterialDesignBookmarks);
94 } 93 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698