summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-27 06:23:47 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-27 06:23:47 +0000
commit4e3f18c0288edd1067d9e47c6bbdb895f881a931 (patch)
treec440bf5c636a134e9334cd376655631d4c3b6413
parentfcec86d7a11cf19ab655a1bf5254108c8f5a56c0 (diff)
downloadchromium_src-4e3f18c0288edd1067d9e47c6bbdb895f881a931.zip
chromium_src-4e3f18c0288edd1067d9e47c6bbdb895f881a931.tar.gz
chromium_src-4e3f18c0288edd1067d9e47c6bbdb895f881a931.tar.bz2
Need to temporarily flip this back to gfx::NativeView since the other platforms don't like it as window. Will fix later.
TBR=sky BUG=none TEST=none git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19461 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/bookmarks/bookmark_context_menu_controller.cc2
-rw-r--r--chrome/browser/bookmarks/bookmark_context_menu_controller.h5
2 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/bookmarks/bookmark_context_menu_controller.cc b/chrome/browser/bookmarks/bookmark_context_menu_controller.cc
index 5065fc7..4f6d941 100644
--- a/chrome/browser/bookmarks/bookmark_context_menu_controller.cc
+++ b/chrome/browser/bookmarks/bookmark_context_menu_controller.cc
@@ -193,7 +193,7 @@ class SelectOnCreationHandler : public BookmarkEditor::Handler {
} // namespace
BookmarkContextMenuController::BookmarkContextMenuController(
- gfx::NativeWindow parent_window,
+ gfx::NativeView parent_window,
BookmarkContextMenuControllerDelegate* delegate,
Profile* profile,
PageNavigator* navigator,
diff --git a/chrome/browser/bookmarks/bookmark_context_menu_controller.h b/chrome/browser/bookmarks/bookmark_context_menu_controller.h
index 7fc529f..4d611d8 100644
--- a/chrome/browser/bookmarks/bookmark_context_menu_controller.h
+++ b/chrome/browser/bookmarks/bookmark_context_menu_controller.h
@@ -57,7 +57,7 @@ class BookmarkContextMenuController : public BookmarkModelObserver {
// |selection| is the nodes the context menu operates on and may be empty.
// |configuration| determines which items to show.
BookmarkContextMenuController(
- gfx::NativeWindow parent_window,
+ gfx::NativeView parent_window,
BookmarkContextMenuControllerDelegate* delegate,
Profile* profile,
PageNavigator* navigator,
@@ -114,7 +114,8 @@ class BookmarkContextMenuController : public BookmarkModelObserver {
// parent_ is returned.
const BookmarkNode* GetParentForNewNodes() const;
- gfx::NativeWindow parent_window_;
+ // TODO(beng): change to gfx::NativeWindow
+ gfx::NativeView parent_window_;
BookmarkContextMenuControllerDelegate* delegate_;
Profile* profile_;
PageNavigator* navigator_;