summaryrefslogtreecommitdiffstats
path: root/chrome/browser/views
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/views')
-rw-r--r--chrome/browser/views/blocked_popup_container.cc9
-rw-r--r--chrome/browser/views/blocked_popup_container.h4
-rw-r--r--chrome/browser/views/bookmark_bar_view.h2
-rw-r--r--chrome/browser/views/bookmark_editor_view.cc4
-rw-r--r--chrome/browser/views/bookmark_editor_view.h4
-rw-r--r--chrome/browser/views/download_item_view.cc34
-rw-r--r--chrome/browser/views/frame/browser_view.cc12
-rw-r--r--chrome/browser/views/frame/browser_view.h9
-rw-r--r--chrome/browser/views/toolbar_view.cc128
-rw-r--r--chrome/browser/views/toolbar_view.h2
10 files changed, 109 insertions, 99 deletions
diff --git a/chrome/browser/views/blocked_popup_container.cc b/chrome/browser/views/blocked_popup_container.cc
index 47e5f8e..b94adb1 100644
--- a/chrome/browser/views/blocked_popup_container.cc
+++ b/chrome/browser/views/blocked_popup_container.cc
@@ -179,8 +179,8 @@ gfx::Size BlockedPopupContainerView::GetPreferredSize() {
void BlockedPopupContainerView::ButtonPressed(views::Button* sender) {
if (sender == popup_count_label_) {
- launch_menu_.reset(new Menu(this, Menu::TOPLEFT,
- container_->GetNativeView()));
+ launch_menu_.reset(views::Menu::Create(this, views::Menu::TOPLEFT,
+ container_->GetNativeView()));
// Set items 1 .. popup_count as individual popups.
size_t popup_count = container_->GetBlockedPopupCount();
@@ -191,7 +191,7 @@ void BlockedPopupContainerView::ButtonPressed(views::Button* sender) {
// the value 0 as the nop command.
launch_menu_->AppendMenuItem(i + 1,
l10n_util::GetStringF(IDS_POPUP_TITLE_FORMAT, url, title),
- Menu::NORMAL);
+ views::Menu::NORMAL);
}
// Set items (kImpossibleNumberOfPopups + 1) ..
@@ -201,7 +201,8 @@ void BlockedPopupContainerView::ButtonPressed(views::Button* sender) {
launch_menu_->AppendSeparator();
for (size_t i = 0; i < hosts.size(); ++i) {
launch_menu_->AppendMenuItem(kImpossibleNumberOfPopups + i + 1,
- l10n_util::GetStringF(IDS_POPUP_HOST_FORMAT, hosts[i]), Menu::NORMAL);
+ l10n_util::GetStringF(IDS_POPUP_HOST_FORMAT, hosts[i]),
+ views::Menu::NORMAL);
}
CPoint cursor_position;
diff --git a/chrome/browser/views/blocked_popup_container.h b/chrome/browser/views/blocked_popup_container.h
index 640bdd0..dcf7d8f 100644
--- a/chrome/browser/views/blocked_popup_container.h
+++ b/chrome/browser/views/blocked_popup_container.h
@@ -39,7 +39,7 @@ class ImageButton;
// blocked. This view should only be used inside of BlockedPopupContainer.
class BlockedPopupContainerView : public views::View,
public views::ButtonListener,
- public Menu::Delegate {
+ public views::Menu::Delegate {
public:
explicit BlockedPopupContainerView(BlockedPopupContainer* container);
~BlockedPopupContainerView();
@@ -79,7 +79,7 @@ class BlockedPopupContainerView : public views::View,
views::ImageButton* close_button_;
// Popup menu shown to user.
- scoped_ptr<Menu> launch_menu_;
+ scoped_ptr<views::Menu> launch_menu_;
DISALLOW_IMPLICIT_CONSTRUCTORS(BlockedPopupContainerView);
};
diff --git a/chrome/browser/views/bookmark_bar_view.h b/chrome/browser/views/bookmark_bar_view.h
index ccf787e..1986d2f 100644
--- a/chrome/browser/views/bookmark_bar_view.h
+++ b/chrome/browser/views/bookmark_bar_view.h
@@ -42,7 +42,7 @@ class BookmarkBarView : public views::View,
public BookmarkModelObserver,
public views::ViewMenuDelegate,
public views::ButtonListener,
- public Menu::Delegate,
+ public views::Menu::Delegate,
public NotificationObserver,
public views::ContextMenuController,
public views::DragController,
diff --git a/chrome/browser/views/bookmark_editor_view.cc b/chrome/browser/views/bookmark_editor_view.cc
index 0aee8bc..835ba59 100644
--- a/chrome/browser/views/bookmark_editor_view.cc
+++ b/chrome/browser/views/bookmark_editor_view.cc
@@ -225,8 +225,8 @@ void BookmarkEditorView::ShowContextMenu(View* source,
running_menu_for_root_ =
(tree_model_->GetParent(tree_view_->GetSelectedNode()) ==
tree_model_->GetRoot());
- context_menu_.reset(new Menu(this, Menu::TOPLEFT,
- GetWidget()->GetNativeView()));
+ context_menu_.reset(views::Menu::Create(this, views::Menu::TOPLEFT,
+ GetWidget()->GetNativeView()));
context_menu_->AppendMenuItemWithLabel(IDS_EDIT,
l10n_util::GetString(IDS_EDIT));
context_menu_->AppendMenuItemWithLabel(
diff --git a/chrome/browser/views/bookmark_editor_view.h b/chrome/browser/views/bookmark_editor_view.h
index 4ca3fde..754e5f8 100644
--- a/chrome/browser/views/bookmark_editor_view.h
+++ b/chrome/browser/views/bookmark_editor_view.h
@@ -40,7 +40,7 @@ class BookmarkEditorView : public BookmarkEditor,
public views::DialogDelegate,
public views::TextField::Controller,
public views::ContextMenuController,
- public Menu::Delegate,
+ public views::Menu::Delegate,
public BookmarkModelObserver {
FRIEND_TEST(BookmarkEditorViewTest, ChangeParent);
FRIEND_TEST(BookmarkEditorViewTest, ChangeParentAndURL);
@@ -243,7 +243,7 @@ class BookmarkEditorView : public BookmarkEditor,
BookmarkNode* node_;
// The context menu.
- scoped_ptr<Menu> context_menu_;
+ scoped_ptr<views::Menu> context_menu_;
// Mode used to create nodes from.
BookmarkModel* bb_model_;
diff --git a/chrome/browser/views/download_item_view.cc b/chrome/browser/views/download_item_view.cc
index 7aa2a37..1e9554f 100644
--- a/chrome/browser/views/download_item_view.cc
+++ b/chrome/browser/views/download_item_view.cc
@@ -65,7 +65,7 @@ static const int kDisabledOnOpenDuration = 3000;
// DownloadShelfContextMenuWin -------------------------------------------------
class DownloadShelfContextMenuWin : public DownloadShelfContextMenu,
- public Menu::Delegate {
+ public views::Menu::Delegate {
public:
DownloadShelfContextMenuWin::DownloadShelfContextMenuWin(
BaseDownloadItemModel* model,
@@ -75,23 +75,27 @@ class DownloadShelfContextMenuWin : public DownloadShelfContextMenu,
DCHECK(model);
// The menu's anchor point is determined based on the UI layout.
- Menu::AnchorPoint anchor_point;
+ views::Menu::AnchorPoint anchor_point;
if (l10n_util::GetTextDirection() == l10n_util::RIGHT_TO_LEFT)
- anchor_point = Menu::TOPRIGHT;
+ anchor_point = views::Menu::TOPRIGHT;
else
- anchor_point = Menu::TOPLEFT;
+ anchor_point = views::Menu::TOPLEFT;
- Menu context_menu(this, anchor_point, window);
- if (download_->state() == DownloadItem::COMPLETE)
- context_menu.AppendMenuItem(OPEN_WHEN_COMPLETE, L"", Menu::NORMAL);
- else
- context_menu.AppendMenuItem(OPEN_WHEN_COMPLETE, L"", Menu::CHECKBOX);
- context_menu.AppendMenuItem(ALWAYS_OPEN_TYPE, L"", Menu::CHECKBOX);
- context_menu.AppendSeparator();
- context_menu.AppendMenuItem(SHOW_IN_FOLDER, L"", Menu::NORMAL);
- context_menu.AppendSeparator();
- context_menu.AppendMenuItem(CANCEL, L"", Menu::NORMAL);
- context_menu.RunMenuAt(point.x(), point.y());
+ scoped_ptr<views::Menu> context_menu(
+ views::Menu::Create(this, anchor_point, window));
+ if (download_->state() == DownloadItem::COMPLETE) {
+ context_menu->AppendMenuItem(OPEN_WHEN_COMPLETE, L"",
+ views::Menu::NORMAL);
+ } else {
+ context_menu->AppendMenuItem(OPEN_WHEN_COMPLETE, L"",
+ views::Menu::CHECKBOX);
+ }
+ context_menu->AppendMenuItem(ALWAYS_OPEN_TYPE, L"", views::Menu::CHECKBOX);
+ context_menu->AppendSeparator();
+ context_menu->AppendMenuItem(SHOW_IN_FOLDER, L"", views::Menu::NORMAL);
+ context_menu->AppendSeparator();
+ context_menu->AppendMenuItem(CANCEL, L"", views::Menu::NORMAL);
+ context_menu->RunMenuAt(point.x(), point.y());
}
// Menu::Delegate implementation ---------------------------------------------
diff --git a/chrome/browser/views/frame/browser_view.cc b/chrome/browser/views/frame/browser_view.cc
index b3aa486..a438cdf 100644
--- a/chrome/browser/views/frame/browser_view.cc
+++ b/chrome/browser/views/frame/browser_view.cc
@@ -60,6 +60,7 @@
#include "grit/generated_resources.h"
#include "grit/theme_resources.h"
#include "grit/webkit_resources.h"
+#include "views/controls/menu/menu_win.h"
#include "views/controls/scrollbar/native_scroll_bar.h"
#include "views/fill_layout.h"
#include "views/view.h"
@@ -1298,7 +1299,7 @@ void BrowserView::Init() {
void BrowserView::InitSystemMenu() {
HMENU system_menu = GetSystemMenu(frame_->GetNativeView(), FALSE);
- system_menu_.reset(new Menu(system_menu));
+ system_menu_.reset(new views::MenuWin(system_menu));
int insertion_index = std::max(0, system_menu_->ItemCount() - 1);
// We add the menu items in reverse order so that insertion_index never needs
// to change.
@@ -1549,7 +1550,7 @@ void BrowserView::LoadAccelerators() {
free(accelerators);
}
-void BrowserView::BuildMenuForTabStriplessWindow(Menu* menu,
+void BrowserView::BuildMenuForTabStriplessWindow(views::Menu* menu,
int insertion_index) {
encoding_menu_delegate_.reset(new EncodingMenuControllerDelegate(
browser_.get()));
@@ -1560,7 +1561,7 @@ void BrowserView::BuildMenuForTabStriplessWindow(Menu* menu,
} else {
int command = kMenuLayout[i].command;
if (command == IDC_ENCODING_MENU) {
- Menu* encoding_menu = menu->AddSubMenu(
+ views::Menu* encoding_menu = menu->AddSubMenu(
insertion_index,
IDC_ENCODING_MENU,
l10n_util::GetString(IDS_ENCODING_MENU));
@@ -1568,8 +1569,9 @@ void BrowserView::BuildMenuForTabStriplessWindow(Menu* menu,
EncodingMenuControllerDelegate::BuildEncodingMenu(browser_->profile(),
encoding_menu);
} else if (command == IDC_ZOOM_MENU) {
- Menu* zoom_menu = menu->AddSubMenu(insertion_index, IDC_ZOOM_MENU,
- l10n_util::GetString(IDS_ZOOM_MENU));
+ views::Menu* zoom_menu =
+ menu->AddSubMenu(insertion_index, IDC_ZOOM_MENU,
+ l10n_util::GetString(IDS_ZOOM_MENU));
zoom_menu->AppendMenuItemWithLabel(
IDC_ZOOM_PLUS,
l10n_util::GetString(IDS_ZOOM_PLUS));
diff --git a/chrome/browser/views/frame/browser_view.h b/chrome/browser/views/frame/browser_view.h
index 40afbc5..c3e0734 100644
--- a/chrome/browser/views/frame/browser_view.h
+++ b/chrome/browser/views/frame/browser_view.h
@@ -25,10 +25,13 @@ class ExtensionShelf;
class FullscreenExitBubble;
class HtmlDialogUIDelegate;
class InfoBarContainer;
-class Menu;
class StatusBubbleViews;
class TabContentsContainerView;
+namespace views {
+class Menu;
+}
+
///////////////////////////////////////////////////////////////////////////////
// BrowserView
//
@@ -316,7 +319,7 @@ class BrowserView : public BrowserWindow,
void LoadAccelerators();
// Builds the correct menu for when we have minimal chrome.
- void BuildMenuForTabStriplessWindow(Menu* menu, int insertion_index);
+ void BuildMenuForTabStriplessWindow(views::Menu* menu, int insertion_index);
// Retrieves the command id for the specified Windows app command.
int GetCommandIDForAppCommandID(int app_command_id) const;
@@ -376,7 +379,7 @@ class BrowserView : public BrowserWindow,
scoped_ptr<FullscreenExitBubble> fullscreen_bubble_;
// Lazily created representation of the system menu.
- scoped_ptr<Menu> system_menu_;
+ scoped_ptr<views::Menu> system_menu_;
// The default favicon image.
static SkBitmap default_favicon_;
diff --git a/chrome/browser/views/toolbar_view.cc b/chrome/browser/views/toolbar_view.cc
index 104cb34..5162b98 100644
--- a/chrome/browser/views/toolbar_view.cc
+++ b/chrome/browser/views/toolbar_view.cc
@@ -583,28 +583,28 @@ gfx::Size BrowserToolbarView::GetPreferredSize() {
}
void BrowserToolbarView::RunPageMenu(const gfx::Point& pt, HWND hwnd) {
- Menu::AnchorPoint anchor = Menu::TOPRIGHT;
+ views::Menu::AnchorPoint anchor = views::Menu::TOPRIGHT;
if (UILayoutIsRightToLeft())
- anchor = Menu::TOPLEFT;
+ anchor = views::Menu::TOPLEFT;
- Menu menu(this, anchor, hwnd);
- menu.AppendMenuItemWithLabel(IDC_CREATE_SHORTCUTS,
+ scoped_ptr<views::Menu> menu(views::Menu::Create(this, anchor, hwnd));
+ menu->AppendMenuItemWithLabel(IDC_CREATE_SHORTCUTS,
l10n_util::GetString(IDS_CREATE_SHORTCUTS));
- menu.AppendSeparator();
- menu.AppendMenuItemWithLabel(IDC_CUT, l10n_util::GetString(IDS_CUT));
- menu.AppendMenuItemWithLabel(IDC_COPY, l10n_util::GetString(IDS_COPY));
- menu.AppendMenuItemWithLabel(IDC_PASTE, l10n_util::GetString(IDS_PASTE));
- menu.AppendSeparator();
-
- menu.AppendMenuItemWithLabel(IDC_FIND,
- l10n_util::GetString(IDS_FIND));
- menu.AppendMenuItemWithLabel(IDC_SAVE_PAGE,
- l10n_util::GetString(IDS_SAVE_PAGE));
- menu.AppendMenuItemWithLabel(IDC_PRINT, l10n_util::GetString(IDS_PRINT));
- menu.AppendSeparator();
-
- Menu* zoom_menu = menu.AppendSubMenu(IDC_ZOOM_MENU,
- l10n_util::GetString(IDS_ZOOM_MENU));
+ menu->AppendSeparator();
+ menu->AppendMenuItemWithLabel(IDC_CUT, l10n_util::GetString(IDS_CUT));
+ menu->AppendMenuItemWithLabel(IDC_COPY, l10n_util::GetString(IDS_COPY));
+ menu->AppendMenuItemWithLabel(IDC_PASTE, l10n_util::GetString(IDS_PASTE));
+ menu->AppendSeparator();
+
+ menu->AppendMenuItemWithLabel(IDC_FIND,
+ l10n_util::GetString(IDS_FIND));
+ menu->AppendMenuItemWithLabel(IDC_SAVE_PAGE,
+ l10n_util::GetString(IDS_SAVE_PAGE));
+ menu->AppendMenuItemWithLabel(IDC_PRINT, l10n_util::GetString(IDS_PRINT));
+ menu->AppendSeparator();
+
+ views::Menu* zoom_menu = menu->AppendSubMenu(
+ IDC_ZOOM_MENU, l10n_util::GetString(IDS_ZOOM_MENU));
zoom_menu->AppendMenuItemWithLabel(IDC_ZOOM_PLUS,
l10n_util::GetString(IDS_ZOOM_PLUS));
zoom_menu->AppendMenuItemWithLabel(IDC_ZOOM_NORMAL,
@@ -613,7 +613,7 @@ void BrowserToolbarView::RunPageMenu(const gfx::Point& pt, HWND hwnd) {
l10n_util::GetString(IDS_ZOOM_MINUS));
// Create encoding menu.
- Menu* encoding_menu = menu.AppendSubMenu(
+ views::Menu* encoding_menu = menu->AppendSubMenu(
IDC_ENCODING_MENU, l10n_util::GetString(IDS_ENCODING_MENU));
EncodingMenuControllerDelegate::BuildEncodingMenu(profile_, encoding_menu);
@@ -629,8 +629,8 @@ void BrowserToolbarView::RunPageMenu(const gfx::Point& pt, HWND hwnd) {
{ IDC_TASK_MANAGER, IDS_TASK_MANAGER }
};
// Append developer menu.
- menu.AppendSeparator();
- Menu* developer_menu = menu.AppendSubMenu(IDC_DEVELOPER_MENU,
+ menu->AppendSeparator();
+ views::Menu* developer_menu = menu->AppendSubMenu(IDC_DEVELOPER_MENU,
l10n_util::GetString(IDS_DEVELOPER_MENU));
for (int i = 0; i < arraysize(developer_menu_materials); ++i) {
if (developer_menu_materials[i].menu_id) {
@@ -642,24 +642,24 @@ void BrowserToolbarView::RunPageMenu(const gfx::Point& pt, HWND hwnd) {
}
}
- menu.AppendSeparator();
+ menu->AppendSeparator();
- menu.AppendMenuItemWithLabel(IDC_REPORT_BUG,
+ menu->AppendMenuItemWithLabel(IDC_REPORT_BUG,
l10n_util::GetString(IDS_REPORT_BUG));
- menu.RunMenuAt(pt.x(), pt.y());
+ menu->RunMenuAt(pt.x(), pt.y());
}
void BrowserToolbarView::RunAppMenu(const gfx::Point& pt, HWND hwnd) {
- Menu::AnchorPoint anchor = Menu::TOPRIGHT;
+ views::Menu::AnchorPoint anchor = views::Menu::TOPRIGHT;
if (UILayoutIsRightToLeft())
- anchor = Menu::TOPLEFT;
+ anchor = views::Menu::TOPLEFT;
- Menu menu(this, anchor, hwnd);
- menu.AppendMenuItemWithLabel(IDC_NEW_TAB, l10n_util::GetString(IDS_NEW_TAB));
- menu.AppendMenuItemWithLabel(IDC_NEW_WINDOW,
- l10n_util::GetString(IDS_NEW_WINDOW));
- menu.AppendMenuItemWithLabel(IDC_NEW_INCOGNITO_WINDOW,
- l10n_util::GetString(IDS_NEW_INCOGNITO_WINDOW));
+ scoped_ptr<views::Menu> menu(views::Menu::Create(this, anchor, hwnd));
+ menu->AppendMenuItemWithLabel(IDC_NEW_TAB, l10n_util::GetString(IDS_NEW_TAB));
+ menu->AppendMenuItemWithLabel(IDC_NEW_WINDOW,
+ l10n_util::GetString(IDS_NEW_WINDOW));
+ menu->AppendMenuItemWithLabel(IDC_NEW_INCOGNITO_WINDOW,
+ l10n_util::GetString(IDS_NEW_INCOGNITO_WINDOW));
// Enumerate profiles asynchronously and then create the parent menu item.
// We will create the child menu items for this once the asynchronous call is
@@ -667,44 +667,44 @@ void BrowserToolbarView::RunAppMenu(const gfx::Point& pt, HWND hwnd) {
const CommandLine& command_line = *CommandLine::ForCurrentProcess();
if (command_line.HasSwitch(switches::kEnableUserDataDirProfiles)) {
profiles_helper_->GetProfiles(NULL);
- profiles_menu_ = menu.AppendSubMenu(IDC_PROFILE_MENU,
- l10n_util::GetString(IDS_PROFILE_MENU));
+ profiles_menu_ = menu->AppendSubMenu(
+ IDC_PROFILE_MENU, l10n_util::GetString(IDS_PROFILE_MENU));
}
- menu.AppendSeparator();
- menu.AppendMenuItemWithLabel(IDC_SHOW_BOOKMARK_BAR,
- l10n_util::GetString(IDS_SHOW_BOOKMARK_BAR));
- menu.AppendMenuItemWithLabel(IDC_FULLSCREEN,
- l10n_util::GetString(IDS_FULLSCREEN));
- menu.AppendSeparator();
- menu.AppendMenuItemWithLabel(IDC_SHOW_HISTORY,
- l10n_util::GetString(IDS_SHOW_HISTORY));
- menu.AppendMenuItemWithLabel(IDC_SHOW_BOOKMARK_MANAGER,
- l10n_util::GetString(IDS_BOOKMARK_MANAGER));
- menu.AppendMenuItemWithLabel(IDC_SHOW_DOWNLOADS,
- l10n_util::GetString(IDS_SHOW_DOWNLOADS));
- menu.AppendSeparator();
+ menu->AppendSeparator();
+ menu->AppendMenuItemWithLabel(IDC_SHOW_BOOKMARK_BAR,
+ l10n_util::GetString(IDS_SHOW_BOOKMARK_BAR));
+ menu->AppendMenuItemWithLabel(IDC_FULLSCREEN,
+ l10n_util::GetString(IDS_FULLSCREEN));
+ menu->AppendSeparator();
+ menu->AppendMenuItemWithLabel(IDC_SHOW_HISTORY,
+ l10n_util::GetString(IDS_SHOW_HISTORY));
+ menu->AppendMenuItemWithLabel(IDC_SHOW_BOOKMARK_MANAGER,
+ l10n_util::GetString(IDS_BOOKMARK_MANAGER));
+ menu->AppendMenuItemWithLabel(IDC_SHOW_DOWNLOADS,
+ l10n_util::GetString(IDS_SHOW_DOWNLOADS));
+ menu->AppendSeparator();
#ifdef CHROME_PERSONALIZATION
if (!Personalization::IsP13NDisabled()) {
- menu.AppendMenuItemWithLabel(IDC_P13N_INFO,
+ menu->AppendMenuItemWithLabel(IDC_P13N_INFO,
Personalization::GetMenuItemInfoText(browser()));
}
#endif
- menu.AppendMenuItemWithLabel(IDC_CLEAR_BROWSING_DATA,
- l10n_util::GetString(IDS_CLEAR_BROWSING_DATA));
- menu.AppendMenuItemWithLabel(IDC_IMPORT_SETTINGS,
- l10n_util::GetString(IDS_IMPORT_SETTINGS));
- menu.AppendSeparator();
- menu.AppendMenuItemWithLabel(IDC_OPTIONS, l10n_util::GetStringF(IDS_OPTIONS,
- l10n_util::GetString(IDS_PRODUCT_NAME)));
- menu.AppendMenuItemWithLabel(IDC_ABOUT, l10n_util::GetStringF(IDS_ABOUT,
- l10n_util::GetString(IDS_PRODUCT_NAME)));
- menu.AppendMenuItemWithLabel(IDC_HELP_PAGE,
- l10n_util::GetString(IDS_HELP_PAGE));
- menu.AppendSeparator();
- menu.AppendMenuItemWithLabel(IDC_EXIT, l10n_util::GetString(IDS_EXIT));
-
- menu.RunMenuAt(pt.x(), pt.y());
+ menu->AppendMenuItemWithLabel(IDC_CLEAR_BROWSING_DATA,
+ l10n_util::GetString(IDS_CLEAR_BROWSING_DATA));
+ menu->AppendMenuItemWithLabel(IDC_IMPORT_SETTINGS,
+ l10n_util::GetString(IDS_IMPORT_SETTINGS));
+ menu->AppendSeparator();
+ menu->AppendMenuItemWithLabel(IDC_OPTIONS, l10n_util::GetStringF(IDS_OPTIONS,
+ l10n_util::GetString(IDS_PRODUCT_NAME)));
+ menu->AppendMenuItemWithLabel(IDC_ABOUT, l10n_util::GetStringF(IDS_ABOUT,
+ l10n_util::GetString(IDS_PRODUCT_NAME)));
+ menu->AppendMenuItemWithLabel(IDC_HELP_PAGE,
+ l10n_util::GetString(IDS_HELP_PAGE));
+ menu->AppendSeparator();
+ menu->AppendMenuItemWithLabel(IDC_EXIT, l10n_util::GetString(IDS_EXIT));
+
+ menu->RunMenuAt(pt.x(), pt.y());
// Menu is going away, so set the profiles menu pointer to NULL.
profiles_menu_ = NULL;
diff --git a/chrome/browser/views/toolbar_view.h b/chrome/browser/views/toolbar_view.h
index ad373d4..64feb34 100644
--- a/chrome/browser/views/toolbar_view.h
+++ b/chrome/browser/views/toolbar_view.h
@@ -202,7 +202,7 @@ class BrowserToolbarView : public views::View,
TabContents* tab_;
// Profiles menu to populate with profile names.
- Menu* profiles_menu_;
+ views::Menu* profiles_menu_;
// Helper class to enumerate profiles information on the file thread.
scoped_refptr<GetProfilesHelper> profiles_helper_;
generated by cgit v1.1 at 2025-01-31 18:15:54 +0000