diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-07 19:55:02 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-07 19:55:02 +0000 |
| commit | 5aae4c66b3b7343677c64c4291982822459f2cba (patch) | |
| tree | c5c9cbe9a3b5363fddc2bfd0119773d56f000e45 /chrome | |
| parent | ca6c1354c68d409a874395870e601d48c3093a5b (diff) | |
| download | chromium_src-5aae4c66b3b7343677c64c4291982822459f2cba.zip chromium_src-5aae4c66b3b7343677c64c4291982822459f2cba.tar.gz chromium_src-5aae4c66b3b7343677c64c4291982822459f2cba.tar.bz2 | |
Wires up views/gtk to use the gtk bookmark editor.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/271001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28292 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/views/bookmark_bubble_view.cc | 4 | ||||
| -rwxr-xr-x | chrome/chrome.gyp | 2 | ||||
| -rw-r--r-- | chrome/common/temp_scaffolding_stubs.cc | 11 |
3 files changed, 4 insertions, 13 deletions
diff --git a/chrome/browser/views/bookmark_bubble_view.cc b/chrome/browser/views/bookmark_bubble_view.cc index c85052f..f0acd1f 100644 --- a/chrome/browser/views/bookmark_bubble_view.cc +++ b/chrome/browser/views/bookmark_bubble_view.cc @@ -411,8 +411,8 @@ void BookmarkBubbleView::ShowEditor() { // restored to the browser. ShowWindow(GetWidget()->GetNativeView(), SW_HIDE); #else - NOTIMPLEMENTED(); // TODO(brettw) find the parent. - gfx::NativeView parent = NULL; + gfx::NativeView parent = GTK_WIDGET( + static_cast<views::WidgetGtk*>(GetWidget())->GetTransientParent()); #endif // Even though we just hid the window, we need to invoke Close to schedule diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index a14c311..fb39caf 100755 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -2691,6 +2691,8 @@ ['include', '^browser/gtk/about_chrome_dialog.h'], ['include', '^browser/gtk/autocomplete_edit_gtk.cc'], ['include', '^browser/gtk/autocomplete_edit_gtk.h'], + ['include', '^browser/gtk/bookmark_editor_gtk.cc'], + ['include', '^browser/gtk/bookmark_editor_gtk.h'], ['include', '^browser/gtk/bookmark_manager_gtk.cc'], ['include', '^browser/gtk/bookmark_manager_gtk.h'], ['include', '^browser/gtk/bookmark_tree_model.cc'], diff --git a/chrome/common/temp_scaffolding_stubs.cc b/chrome/common/temp_scaffolding_stubs.cc index c36525b..4ab32eb 100644 --- a/chrome/common/temp_scaffolding_stubs.cc +++ b/chrome/common/temp_scaffolding_stubs.cc @@ -24,8 +24,6 @@ #endif #if defined(TOOLKIT_VIEWS) -#include "chrome/browser/bookmarks/bookmark_editor.h" -#include "chrome/browser/bookmarks/bookmark_manager.h" #include "chrome/browser/download/download_request_dialog_delegate.h" #include "chrome/browser/download/download_request_manager.h" #include "chrome/browser/tab_contents/constrained_window.h" @@ -259,13 +257,4 @@ ConstrainedWindow* ConstrainedWindow::CreateConstrainedDialog( return NULL; } -void BookmarkEditor::Show(gfx::NativeView parent_window, - Profile* profile, - const BookmarkNode* parent, - const BookmarkNode* node, - Configuration configuration, - Handler* handler) { - NOTIMPLEMENTED(); -} - #endif |