diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-26 21:55:21 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-26 21:55:21 +0000 |
| commit | 3229c19c6370ca99bf838b7e08a844226d693f02 (patch) | |
| tree | def9a4d042fe2e957c45c052a22b539c6917bd90 /chrome | |
| parent | 70554e84d082f51ec6c04891c21942923370694c (diff) | |
| download | chromium_src-3229c19c6370ca99bf838b7e08a844226d693f02.zip chromium_src-3229c19c6370ca99bf838b7e08a844226d693f02.tar.gz chromium_src-3229c19c6370ca99bf838b7e08a844226d693f02.tar.bz2 | |
Fix more compilation errors in browser_view.cc and an error I introduced in a
previous change that used the wrong parent variable when showing HTML dialogs.
Review URL: http://codereview.chromium.org/113864
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16929 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/bookmarks/bookmark_context_menu.h | 6 | ||||
| -rw-r--r-- | chrome/browser/views/frame/browser_view.cc | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/bookmarks/bookmark_context_menu.h b/chrome/browser/bookmarks/bookmark_context_menu.h index bf3782d..035af5e 100644 --- a/chrome/browser/bookmarks/bookmark_context_menu.h +++ b/chrome/browser/bookmarks/bookmark_context_menu.h @@ -12,7 +12,7 @@ #include "chrome/browser/bookmarks/bookmark_model.h" // TODO(port): Port this file. -#if defined(OS_WIN) +#if defined(OS_WIN) || defined(TOOLKIT_VIEWS) #include "views/controls/menu/chrome_menu.h" #elif defined(OS_LINUX) #include "chrome/browser/gtk/menu_gtk.h" @@ -27,7 +27,7 @@ class PageNavigator; // bookmark bar, items on the bookmark bar, submenus of the bookmark bar and // the bookmark manager. class BookmarkContextMenu : public BookmarkModelObserver, -#if defined(OS_WIN) +#if defined(OS_WIN) || defined(TOOLKIT_VIEWS) public views::MenuDelegate #elif defined(OS_LINUX) public MenuGtk::Delegate @@ -139,7 +139,7 @@ class BookmarkContextMenu : public BookmarkModelObserver, BookmarkModel* model_; ConfigurationType configuration_; -#if defined(OS_WIN) +#if defined(OS_WIN) || defined(TOOLKIT_VIEWS) scoped_ptr<views::MenuItemView> menu_; #elif defined(OS_LINUX) scoped_ptr<MenuGtk> menu_; diff --git a/chrome/browser/views/frame/browser_view.cc b/chrome/browser/views/frame/browser_view.cc index d83cc4e..5235fcd 100644 --- a/chrome/browser/views/frame/browser_view.cc +++ b/chrome/browser/views/frame/browser_view.cc @@ -863,7 +863,7 @@ void BrowserView::ShowHTMLDialog(HtmlDialogUIDelegate* delegate, // Default to using our window as the parent if the argument is not specified. gfx::NativeWindow parent = parent_window ? parent_window : GetNativeHandle(); - browser::ShowHtmlDialogView(parent_window, browser_.get(), delegate); + browser::ShowHtmlDialogView(parent, browser_.get(), delegate); } void BrowserView::UserChangedTheme() { |