diff options
Diffstat (limited to 'chrome/browser/views/bookmark_manager_view.cc')
-rw-r--r-- | chrome/browser/views/bookmark_manager_view.cc | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/chrome/browser/views/bookmark_manager_view.cc b/chrome/browser/views/bookmark_manager_view.cc index fc36cd6..ae9973a 100644 --- a/chrome/browser/views/bookmark_manager_view.cc +++ b/chrome/browser/views/bookmark_manager_view.cc @@ -27,7 +27,6 @@ #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" #include "chrome/common/win_util.h" -#include "chrome/views/container_win.h" #include "chrome/views/grid_layout.h" #include "chrome/views/menu_button.h" #include "chrome/views/single_split_view.h" @@ -338,7 +337,7 @@ void BookmarkManagerView::OnDoubleClick() { // we can use // event_utils::DispositionFromEventFlags(sender->mouse_event_flags()) . bookmark_utils::OpenAll( - GetContainer()->GetHWND(), profile_, NULL, nodes, CURRENT_TAB); + GetWidget()->GetHWND(), profile_, NULL, nodes, CURRENT_TAB); } void BookmarkManagerView::OnTableViewDelete(views::TableView* table) { @@ -359,7 +358,7 @@ void BookmarkManagerView::OnKeyDown(unsigned short virtual_keycode) { SelectInTree(selected_nodes[0]); } else { bookmark_utils::OpenAll( - GetContainer()->GetHWND(), profile_, NULL, selected_nodes, + GetWidget()->GetHWND(), profile_, NULL, selected_nodes, CURRENT_TAB); } break; @@ -463,7 +462,7 @@ void BookmarkManagerView::ShowContextMenu(views::View* source, bool is_mouse_gesture) { DCHECK(source == table_view_ || source == tree_view_); bool is_table = (source == table_view_); - ShowMenu(GetContainer()->GetHWND(), x, y, + ShowMenu(GetWidget()->GetHWND(), x, y, is_table ? BookmarkContextMenu::BOOKMARK_MANAGER_TABLE : BookmarkContextMenu::BOOKMARK_MANAGER_TREE); } @@ -514,7 +513,7 @@ void BookmarkManagerView::FileSelected(const std::wstring& path, ProfileInfo profile_info; profile_info.browser_type = BOOKMARKS_HTML; profile_info.source_path = path; - StartImportingWithUI(GetContainer()->GetHWND(), FAVORITES, host, + StartImportingWithUI(GetWidget()->GetHWND(), FAVORITES, host, profile_info, profile_, new ImportObserverImpl(profile()), false); } else if (id == IDS_BOOKMARK_MANAGER_EXPORT_MENU) { @@ -640,7 +639,7 @@ void BookmarkManagerView::ShowMenu( std::vector<BookmarkNode*> nodes; if (node) nodes.push_back(node); - BookmarkContextMenu menu(GetContainer()->GetHWND(), profile_, NULL, NULL, + BookmarkContextMenu menu(GetWidget()->GetHWND(), profile_, NULL, NULL, node, nodes, config); menu.RunMenuAt(x, y); } @@ -679,7 +678,7 @@ void BookmarkManagerView::ShowToolsMenu(HWND host, int x, int y) { menu.AppendMenuItemWithLabel( IDS_BOOKMARK_MANAGER_EXPORT_MENU, l10n_util::GetString(IDS_BOOKMARK_MANAGER_EXPORT_MENU)); - menu.RunMenuAt(GetContainer()->GetHWND(), gfx::Rect(x, y, 0, 0), + menu.RunMenuAt(GetWidget()->GetHWND(), gfx::Rect(x, y, 0, 0), views::MenuItemView::TOPLEFT, true); } @@ -696,7 +695,7 @@ void BookmarkManagerView::ShowImportBookmarksFileChooser() { select_file_dialog_ = SelectFileDialog::Create(this); select_file_dialog_->SelectFile( SelectFileDialog::SELECT_OPEN_FILE, std::wstring(), L"bookmarks.html", - filter_string, std::wstring(), GetContainer()->GetHWND(), + filter_string, std::wstring(), GetWidget()->GetHWND(), reinterpret_cast<void*>(IDS_BOOKMARK_MANAGER_IMPORT_MENU)); } @@ -708,6 +707,6 @@ void BookmarkManagerView::ShowExportBookmarksFileChooser() { select_file_dialog_->SelectFile( SelectFileDialog::SELECT_SAVEAS_FILE, std::wstring(), L"bookmarks.html", win_util::GetFileFilterFromPath(L"bookmarks.html"), L"html", - GetContainer()->GetHWND(), + GetWidget()->GetHWND(), reinterpret_cast<void*>(IDS_BOOKMARK_MANAGER_EXPORT_MENU)); } |