Make the views bookmark bubble work on GTK....

chrome/browser/views/bookmark_bubble_view.cc

 // Copyright (c) 2006-2008 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/views/bookmark_bubble_view.h"
 
 #include "app/gfx/canvas.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
+#include "base/keyboard_codes.h"
 #include "chrome/app/chrome_dll_resource.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/profile.h"
 #include "chrome/browser/views/info_bubble.h"
 #include "chrome/common/notification_service.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "views/standard_layout.h"
 #include "views/controls/button/native_button.h"
 #include "views/controls/textfield/textfield.h"
+#include "views/focus/focus_manager.h"
 
 using views::Combobox;
 using views::ColumnSet;
 using views::GridLayout;
 using views::Label;
 using views::Link;
 using views::NativeButton;
 using views::View;
 
 // Color of the title.
@@ skipping 71 matching lines @@
   node_parent_index_ = static_cast<int>(
       find(nodes_.begin(), nodes_.end(), node->GetParent()) - nodes_.begin());
 }
 
 int BookmarkBubbleView::RecentlyUsedFoldersModel::GetItemCount() {
   return static_cast<int>(nodes_.size() + 1);
 }
 
 std::wstring BookmarkBubbleView::RecentlyUsedFoldersModel::GetItemAt(
     int index) {
-  if (index == nodes_.size())
+  if (index == static_cast<int>(nodes_.size()))
     return l10n_util::GetString(IDS_BOOMARK_BUBBLE_CHOOSER_ANOTHER_FOLDER);
   return nodes_[index]->GetTitle();
 }
 
 const BookmarkNode* BookmarkBubbleView::RecentlyUsedFoldersModel::GetNodeAt(
     int index) {
   return nodes_[index];
 }
 
 void BookmarkBubbleView::RecentlyUsedFoldersModel::RemoveNode(
@@ skipping 50 matching lines @@
 }
 
 void BookmarkBubbleView::DidChangeBounds(const gfx::Rect& previous,
                                          const gfx::Rect& current) {
   Layout();
 }
 
 void BookmarkBubbleView::BubbleShown() {
   DCHECK(GetWidget());
   GetFocusManager()->RegisterAccelerator(
-      views::Accelerator(VK_RETURN, false, false, false), this);
+      views::Accelerator(base::VKEY_RETURN, false, false, false), this);
 
   title_tf_->RequestFocus();
   title_tf_->SelectAll();
 }
 
 bool BookmarkBubbleView::AcceleratorPressed(
     const views::Accelerator& accelerator) {
-  if (accelerator.GetKeyCode() != VK_RETURN)
+  if (accelerator.GetKeyCode() != base::VKEY_RETURN)
     return false;
   if (edit_button_->HasFocus())
     ButtonPressed(edit_button_);
   else
     ButtonPressed(close_button_);
   return true;
 }
 
+void BookmarkBubbleView::ViewHierarchyChanged(bool is_add, View* parent,
+                                              View* child) {
+  if (is_add && child == this)
+    Init();
+}
+
 BookmarkBubbleView::BookmarkBubbleView(InfoBubbleDelegate* delegate,
                                        Profile* profile,
                                        const GURL& url,
                                        bool newly_bookmarked)
     : delegate_(delegate),
       profile_(profile),
       url_(url),
       newly_bookmarked_(newly_bookmarked),
       parent_model_(
           profile_->GetBookmarkModel(),
           profile_->GetBookmarkModel()->GetMostRecentlyAddedNodeForURL(url)),
       remove_bookmark_(false),
       apply_edits_(true) {
-  Init();
 }
 
 void BookmarkBubbleView::Init() {
   if (!kCloseImage) {
     kCloseImage = ResourceBundle::GetSharedInstance().GetBitmapNamed(
       IDR_INFO_BUBBLE_CLOSE);
   }
 
   remove_link_ = new Link(l10n_util::GetString(
       IDS_BOOMARK_BUBBLE_REMOVE_BOOKMARK));
@@ skipping 145 matching lines @@
   static_cast<InfoBubble*>(GetWidget())->Close();
 }
 
 void BookmarkBubbleView::ShowEditor() {
   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);
 
   // We're about to show the bookmark editor. When the bookmark editor closes
   // we want the browser to become active. WidgetWin::Hide() does a hide in
   // a such way that activation isn't changed, which means when we close
   // Windows gets confused as to who it should give active status to. We
   // explicitly hide the bookmark bubble window in such a way that activation
   // status changes. That way, when the editor closes, activation is properly
   // restored to the browser.
   ShowWindow(GetWidget()->GetNativeView(), SW_HIDE);
+#else
+  NOTIMPLEMENTED();  // TODO(brettw) find the parent.
+  gfx::NativeView parent = NULL;
+#endif
 
   // 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, node,
                          BookmarkEditor::SHOW_TREE, NULL);
   }
 }
@@ skipping 16 matching lines @@
         parent_model_.GetItemCount() - 1) {
       const BookmarkNode* new_parent =
           parent_model_.GetNodeAt(parent_combobox_->selected_item());
       if (new_parent != node->GetParent()) {
         UserMetrics::RecordAction(L"BookmarkBubble_ChangeParent", profile_);
         model->Move(node, new_parent, new_parent->GetChildCount());
       }
     }
   }
 }