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

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

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h"
 
 #include "base/string16.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/bookmarks/bookmark_editor.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #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"
 #include "grit/theme_resources.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_utils.h"
 #include "views/controls/button/native_button.h"
@@ skipping 159 matching lines @@
 
     initialized = true;
   }
 
   remove_link_ = new Link(UTF16ToWide(l10n_util::GetStringUTF16(
       IDS_BOOMARK_BUBBLE_REMOVE_BOOKMARK)));
   remove_link_->SetController(this);
 
   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)));
   close_button_->SetIsDefault(true);
 
   Label* combobox_label = new Label(
       UTF16ToWide(l10n_util::GetStringUTF16(IDS_BOOMARK_BUBBLE_FOLDER_TEXT)));
 
   parent_combobox_ = new Combobox(&parent_model_);
   parent_combobox_->SetSelectedItem(parent_model_.node_parent_index());
@@ skipping 155 matching lines @@
     ShowEditor();
   } else {
     DCHECK(sender == close_button_);
     info_bubble_->set_fade_away_on_close(true);
     Close();
   }
   // WARNING: we've most likely been deleted when CloseWindow returns.
 }
 
 void BookmarkBubbleView::ShowEditor() {
+#if defined(TOUCH_UI)
+  // Commit any edits now.
+  ApplyEdits();

[sky, 2011/04/08 17:48:44]

Close applys the edits, so you shouldn't need to invoke this.

+
+  // Close the InfoBubble
+  Close();
+
+  // Open the Bookmark Manager
+  Browser* browser = BrowserList::GetLastActiveWithProfile(profile_);
+  if (browser)
+    browser->OpenBookmarkManager();
+  else

[sky, 2011/04/08 17:48:44]

This should be a DCHECK before 381.

+    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).
   HWND parent = GetAncestor(GetWidget()->GetNativeView(), GA_ROOTOWNER);
@@ skipping 13 matching lines @@
 
   // Even though we just hid the window, we need to invoke Close to schedule
   // the delete and all that.
   Close();
 
   if (node) {
     BookmarkEditor::Show(parent, profile_, NULL,
                          BookmarkEditor::EditDetails(node),
                          BookmarkEditor::SHOW_TREE);
   }
+#endif
 }
 
 void BookmarkBubbleView::ApplyEdits() {
   // Set this to make sure we don't attempt to apply edits again.
   apply_edits_ = false;
 
   BookmarkModel* model = profile_->GetBookmarkModel();
   const BookmarkNode* node = model->GetMostRecentlyAddedNodeForURL(url_);
   if (node) {
     const string16 new_title = title_tf_->text();
     if (new_title != node->GetTitle()) {
       model->SetTitle(node, new_title);
       UserMetrics::RecordAction(
           UserMetricsAction("BookmarkBubble_ChangeTitleInBubble"),
           profile_);
     }
     // Last index means 'Choose another folder...'
     if (parent_combobox_->selected_item() <
         parent_model_.GetItemCount() - 1) {
       const BookmarkNode* new_parent =
           parent_model_.GetNodeAt(parent_combobox_->selected_item());
       if (new_parent != node->parent()) {
         UserMetrics::RecordAction(
             UserMetricsAction("BookmarkBubble_ChangeParent"), profile_);
         model->Move(node, new_parent, new_parent->child_count());
       }
     }
   }
 }