diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-26 23:50:25 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-26 23:50:25 +0000 |
| commit | c5b6fb5f162db28dcf0c211e8e305f31097d0445 (patch) | |
| tree | 53c2c0e5a106276476a56681f2656b64acec4531 | |
| parent | 7c55f4ce7d876c1e02ab9c8bad7a746697073b1b (diff) | |
| download | chromium_src-c5b6fb5f162db28dcf0c211e8e305f31097d0445.zip chromium_src-c5b6fb5f162db28dcf0c211e8e305f31097d0445.tar.gz chromium_src-c5b6fb5f162db28dcf0c211e8e305f31097d0445.tar.bz2 | |
Fox some compilation problems for Linux. This also adds bookmark_bar_view and
window_sizer to the Linux build.
Review URL: http://codereview.chromium.org/115803
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16953 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/bookmarks/bookmark_drag_data.h | 2 | ||||
| -rw-r--r-- | chrome/browser/views/bookmark_menu_controller_views.cc | 10 | ||||
| -rw-r--r-- | chrome/chrome.gyp | 6 |
3 files changed, 14 insertions, 4 deletions
diff --git a/chrome/browser/bookmarks/bookmark_drag_data.h b/chrome/browser/bookmarks/bookmark_drag_data.h index 18353e6..5e8db56 100644 --- a/chrome/browser/bookmarks/bookmark_drag_data.h +++ b/chrome/browser/bookmarks/bookmark_drag_data.h @@ -71,7 +71,7 @@ struct BookmarkDragData { explicit BookmarkDragData(BookmarkNode* node); explicit BookmarkDragData(const std::vector<BookmarkNode*>& nodes); -#if defined(OS_WIN) +#if defined(TOOLKIT_VIEWS) // Writes elements to data. If there is only one element and it is a URL // the URL and title are written to the clipboard in a format other apps can // use. diff --git a/chrome/browser/views/bookmark_menu_controller_views.cc b/chrome/browser/views/bookmark_menu_controller_views.cc index 3f1fdd2..2ac58eb 100644 --- a/chrome/browser/views/bookmark_menu_controller_views.cc +++ b/chrome/browser/views/bookmark_menu_controller_views.cc @@ -48,10 +48,15 @@ void BookmarkMenuController::RunMenuAt( bool for_drop) { for_drop_ = for_drop; profile_->GetBookmarkModel()->AddObserver(this); +#if defined(OS_WIN) + gfx::NativeView widget = parent_; +#else + gfx::NativeView widget = GTK_WIDGET(parent_); +#endif if (for_drop) { - menu_->RunMenuForDropAt(parent_, bounds, position); + menu_->RunMenuForDropAt(widget, bounds, position); } else { - menu_->RunMenuAt(parent_, bounds, position, false); + menu_->RunMenuAt(widget, bounds, position, false); delete this; } } @@ -94,7 +99,6 @@ bool BookmarkMenuController::CanDrop(views::MenuItemView* menu, // the dragged node is not a parent of the node menu represents. BookmarkNode* drop_node = menu_id_to_node_map_[menu->GetCommand()]; DCHECK(drop_node); - BookmarkNode* node = drop_node; while (drop_node && drop_node != drag_node) drop_node = drop_node->GetParent(); return (drop_node == NULL); diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 51c2645..9bb9802 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -1667,6 +1667,7 @@ ['include', '^browser/dock_info_gtk.cc'], ['include', '^browser/dock_info.cc'], ['include', '^browser/dock_info.h'], + ['include', '^browser/views/bookmark_menu_controller_views.cc'], ['include', '^browser/views/download_item_view.cc'], ['include', '^browser/views/download_item_view.h'], ['include', '^browser/views/download_shelf_view.cc'], @@ -1702,6 +1703,8 @@ ['include', '^browser/views/tabs/tab_renderer.h'], ['include', '^browser/views/tabs/tab_strip.cc'], ['include', '^browser/views/tabs/tab_strip.h'], + ['include', '^browser/window_sizer.cc'], + ['include', '^browser/window_sizer.h'], # Exclude all of browser/gtk, then include the things we want. ['exclude', '^browser/gtk'], @@ -1718,6 +1721,9 @@ ['include', '^browser/gtk/menu_gtk.h'], ['include', '^browser/gtk/sad_tab_gtk.cc'], ['include', '^browser/gtk/sad_tab_gtk.h'], + + # More GTK stuff to exclude outside of the browser/gtk directory + ['exclude', '^browser/bookmarks/bookmark_context_menu_gtk.cc'], ], }], ['toolkit_views==0',{ |