diff options
| author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-09 18:13:25 +0000 |
|---|---|---|
| committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-09 18:13:25 +0000 |
| commit | 756ef54543f64b1295ac6c93df4c7fb9e62ab435 (patch) | |
| tree | 0114ea6b675c41b7480f986f1a25f209afc749f6 /chrome | |
| parent | 7d1d235e5730527a50caf787550055118c164fa0 (diff) | |
| download | chromium_src-756ef54543f64b1295ac6c93df4c7fb9e62ab435.zip chromium_src-756ef54543f64b1295ac6c93df4c7fb9e62ab435.tar.gz chromium_src-756ef54543f64b1295ac6c93df4c7fb9e62ab435.tar.bz2 | |
GTK: Fix browser_tests ViewIDTest.Basic not to expect the page menu.
TBR=evan,estade
BUG=51974
TEST=went green locally.
Review URL: http://codereview.chromium.org/2900004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51983 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/gtk/view_id_util_browsertest.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/browser/gtk/view_id_util_browsertest.cc b/chrome/browser/gtk/view_id_util_browsertest.cc index b647900..783e439 100644 --- a/chrome/browser/gtk/view_id_util_browsertest.cc +++ b/chrome/browser/gtk/view_id_util_browsertest.cc @@ -7,6 +7,7 @@ #include "chrome/browser/browser.h" #include "chrome/browser/browser_window.h" #include "chrome/browser/gtk/view_id_util.h" +#include "chrome/browser/wrench_menu_model.h" #include "chrome/common/url_constants.h" #include "chrome/test/in_process_browser_test.h" @@ -37,6 +38,10 @@ IN_PROC_BROWSER_TEST_F(ViewIDTest, Basic) { if (i == VIEW_ID_DEV_EXTENSION_SHELF) continue; + // The page menu is being removed as part of M6 TopChrome reworking. + if (i == VIEW_ID_PAGE_MENU && WrenchMenuModel::IsEnabled()) + continue; + // The following ids are used only in views implementation. if (i == VIEW_ID_CONTENTS_SPLIT || i == VIEW_ID_INFO_BAR_CONTAINER || |