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

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

Issue 2954273002: [MD Bookmarks] Restore focus after closing a dialog or context menu. (Closed)
Patch Set: fix deps Created 3 years, 5 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 #include <string> 8 #include <string>
9 #include <unordered_set>
10 #include <utility>
9 11
10 #include "base/strings/string16.h" 12 #include "base/strings/string16.h"
11 #include "chrome/browser/profiles/profile.h" 13 #include "chrome/browser/profiles/profile.h"
12 #include "chrome/browser/ui/webui/md_bookmarks/bookmarks_message_handler.h" 14 #include "chrome/browser/ui/webui/md_bookmarks/bookmarks_message_handler.h"
13 #include "chrome/browser/ui/webui/plural_string_handler.h" 15 #include "chrome/browser/ui/webui/plural_string_handler.h"
14 #include "chrome/common/chrome_features.h" 16 #include "chrome/common/chrome_features.h"
15 #include "chrome/common/url_constants.h" 17 #include "chrome/common/url_constants.h"
16 #include "chrome/grit/browser_resources.h" 18 #include "chrome/grit/browser_resources.h"
17 #include "chrome/grit/generated_resources.h" 19 #include "chrome/grit/generated_resources.h"
18 #include "components/strings/grit/components_strings.h" 20 #include "components/strings/grit/components_strings.h"
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 IDR_MD_BOOKMARKS_API_LISTENER_HTML); 113 IDR_MD_BOOKMARKS_API_LISTENER_HTML);
112 source->AddResourcePath("api_listener.js", IDR_MD_BOOKMARKS_API_LISTENER_JS); 114 source->AddResourcePath("api_listener.js", IDR_MD_BOOKMARKS_API_LISTENER_JS);
113 source->AddResourcePath("app.html", IDR_MD_BOOKMARKS_APP_HTML); 115 source->AddResourcePath("app.html", IDR_MD_BOOKMARKS_APP_HTML);
114 source->AddResourcePath("app.js", IDR_MD_BOOKMARKS_APP_JS); 116 source->AddResourcePath("app.js", IDR_MD_BOOKMARKS_APP_JS);
115 source->AddResourcePath("command_manager.html", 117 source->AddResourcePath("command_manager.html",
116 IDR_MD_BOOKMARKS_COMMAND_MANAGER_HTML); 118 IDR_MD_BOOKMARKS_COMMAND_MANAGER_HTML);
117 source->AddResourcePath("command_manager.js", 119 source->AddResourcePath("command_manager.js",
118 IDR_MD_BOOKMARKS_COMMAND_MANAGER_JS); 120 IDR_MD_BOOKMARKS_COMMAND_MANAGER_JS);
119 source->AddResourcePath("constants.html", IDR_MD_BOOKMARKS_CONSTANTS_HTML); 121 source->AddResourcePath("constants.html", IDR_MD_BOOKMARKS_CONSTANTS_HTML);
120 source->AddResourcePath("constants.js", IDR_MD_BOOKMARKS_CONSTANTS_JS); 122 source->AddResourcePath("constants.js", IDR_MD_BOOKMARKS_CONSTANTS_JS);
123 source->AddResourcePath("dialog_focus_manager.html",
124 IDR_MD_BOOKMARKS_DIALOG_FOCUS_MANAGER_HTML);
125 source->AddResourcePath("dialog_focus_manager.js",
126 IDR_MD_BOOKMARKS_DIALOG_FOCUS_MANAGER_JS);
121 source->AddResourcePath("dnd_manager.html", 127 source->AddResourcePath("dnd_manager.html",
122 IDR_MD_BOOKMARKS_DND_MANAGER_HTML); 128 IDR_MD_BOOKMARKS_DND_MANAGER_HTML);
123 source->AddResourcePath("dnd_manager.js", IDR_MD_BOOKMARKS_DND_MANAGER_JS); 129 source->AddResourcePath("dnd_manager.js", IDR_MD_BOOKMARKS_DND_MANAGER_JS);
124 source->AddResourcePath("edit_dialog.html", 130 source->AddResourcePath("edit_dialog.html",
125 IDR_MD_BOOKMARKS_EDIT_DIALOG_HTML); 131 IDR_MD_BOOKMARKS_EDIT_DIALOG_HTML);
126 source->AddResourcePath("edit_dialog.js", IDR_MD_BOOKMARKS_EDIT_DIALOG_JS); 132 source->AddResourcePath("edit_dialog.js", IDR_MD_BOOKMARKS_EDIT_DIALOG_JS);
127 source->AddResourcePath("folder_node.html", 133 source->AddResourcePath("folder_node.html",
128 IDR_MD_BOOKMARKS_FOLDER_NODE_HTML); 134 IDR_MD_BOOKMARKS_FOLDER_NODE_HTML);
129 source->AddResourcePath("folder_node.js", 135 source->AddResourcePath("folder_node.js",
130 IDR_MD_BOOKMARKS_FOLDER_NODE_JS); 136 IDR_MD_BOOKMARKS_FOLDER_NODE_JS);
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 "toastItemsDeleted", IDS_MD_BOOKMARK_MANAGER_TOAST_ITEMS_DELETED); 189 "toastItemsDeleted", IDS_MD_BOOKMARK_MANAGER_TOAST_ITEMS_DELETED);
184 web_ui->AddMessageHandler(std::move(plural_string_handler)); 190 web_ui->AddMessageHandler(std::move(plural_string_handler));
185 191
186 web_ui->AddMessageHandler(base::MakeUnique<BookmarksMessageHandler>()); 192 web_ui->AddMessageHandler(base::MakeUnique<BookmarksMessageHandler>());
187 } 193 }
188 194
189 // static 195 // static
190 bool MdBookmarksUI::IsEnabled() { 196 bool MdBookmarksUI::IsEnabled() {
191 return base::FeatureList::IsEnabled(features::kMaterialDesignBookmarks); 197 return base::FeatureList::IsEnabled(features::kMaterialDesignBookmarks);
192 } 198 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698