summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/browser.cc
diff options
context:
space:
mode:
authorflackr@chromium.org <flackr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-17 19:51:35 +0000
committerflackr@chromium.org <flackr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-17 19:51:35 +0000
commit4c9ee221ac11f509db94c568d7e542ac8a3fc583 (patch)
treed3d210f38288e72f393ed973fc8218397ee88c57 /chrome/browser/ui/browser.cc
parentea4eecfb31a355d988afdebc0a160fcaf24eea58 (diff)
downloadchromium_src-4c9ee221ac11f509db94c568d7e542ac8a3fc583.zip
chromium_src-4c9ee221ac11f509db94c568d7e542ac8a3fc583.tar.gz
chromium_src-4c9ee221ac11f509db94c568d7e542ac8a3fc583.tar.bz2
Use bookmark manager to add/edit bookmark pages with webui_dialogs=1.
This is the first phase towards being able to replace Bookmark Editor with the WebUI Bookmark Manager as part of the GTK removal effort on ChromeOS. It does not yet have a means of selecting a folder to bookmark all of your tabs in and as such can't yet replace all calls to BookmarkEditor::Show. BUG=None TEST=Tested editing bookmarks from the popup bubble and bookmark bar in Linux and TouchUI builds. Review URL: http://codereview.chromium.org/7572022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97186 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/browser.cc')
-rw-r--r--chrome/browser/ui/browser.cc18
1 files changed, 16 insertions, 2 deletions
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index dc1e845..a5c727c 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -1948,16 +1948,30 @@ void Browser::OpenBookmarkManager() {
GetSingletonTabNavigateParams(GURL(chrome::kChromeUIBookmarksURL)));
}
-void Browser::OpenBookmarkManagerForNode(int64 node_id) {
+void Browser::OpenBookmarkManagerWithHash(const std::string& action,
+ int64 node_id) {
UserMetrics::RecordAction(UserMetricsAction("ShowBookmarkManager"));
UserMetrics::RecordAction(UserMetricsAction("ShowBookmarks"));
browser::NavigateParams params(GetSingletonTabNavigateParams(
GURL(chrome::kChromeUIBookmarksURL).Resolve(
- StringPrintf("/#%s", base::Int64ToString(node_id).c_str()))));
+ StringPrintf("/#%s%s", action.c_str(),
+ base::Int64ToString(node_id).c_str()))));
params.path_behavior = browser::NavigateParams::IGNORE_AND_NAVIGATE;
ShowSingletonTabOverwritingNTP(params);
}
+void Browser::OpenBookmarkManagerForNode(int64 node_id) {
+ OpenBookmarkManagerWithHash("", node_id);
+}
+
+void Browser::OpenBookmarkManagerEditNode(int64 node_id) {
+ OpenBookmarkManagerWithHash("e=", node_id);
+}
+
+void Browser::OpenBookmarkManagerAddNodeIn(int64 node_id) {
+ OpenBookmarkManagerWithHash("a=", node_id);
+}
+
void Browser::ShowAppMenu() {
// We record the user metric for this event in WrenchMenu::RunMenu.
window_->ShowAppMenu();