Fix for http://code.google.com/p/chromium-os/issues/detail?id=13899

chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc

Index: chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc
index 2b0db48d162c9c779efa1f8dac6a950376704a63..4949f40357d0fa536af797d8e913cf0eb40aef83 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc
@@ -13,6 +13,8 @@
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/views/info_bubble.h"
 #include "content/common/notification_service.h"
 #include "grit/generated_resources.h"
@@ -192,11 +194,6 @@ void BookmarkBubbleView::Init() {
 
   edit_button_ = new NativeButton(
       this, UTF16ToWide(l10n_util::GetStringUTF16(IDS_BOOMARK_BUBBLE_OPTIONS)));
-#if defined(TOUCH_UI)
-  // TODO(saintlou): We need to disable the Edit button for touch since we are
-  // missing some of the controls for the dialog that would pop up next.
-  edit_button_->SetEnabled(false);
-#endif
 
   close_button_ =
       new NativeButton(this, UTF16ToWide(l10n_util::GetStringUTF16(IDS_DONE)));
@@ -372,12 +369,22 @@ void BookmarkBubbleView::HandleButtonPressed(views::Button* sender) {
 }
 
 void BookmarkBubbleView::ShowEditor() {
+#if defined(TOUCH_UI)
+  // Close the InfoBubble
+  Close();
+
+  // Open the Bookmark Manager
+  Browser* browser = BrowserList::GetLastActiveWithProfile(profile_);
+  DCHECK(browser);
+  if (browser)
+    browser->OpenBookmarkManager();
+  else
+    NOTREACHED();
+
+#else
   const BookmarkNode* node =
       profile_->GetBookmarkModel()->GetMostRecentlyAddedNodeForURL(url_);
 
-  // Commit any edits now.
-  ApplyEdits();
-
 #if defined(OS_WIN)
   // Parent the editor to our root ancestor (not the root we're in, as that
   // is the info bubble and will close shortly).
@@ -405,6 +412,7 @@ void BookmarkBubbleView::ShowEditor() {
                          BookmarkEditor::EditDetails(node),
                          BookmarkEditor::SHOW_TREE);
   }
+#endif
 }
 
 void BookmarkBubbleView::ApplyEdits() {