diff options
| author | pinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-15 17:11:30 +0000 |
|---|---|---|
| committer | pinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-15 17:11:30 +0000 |
| commit | b694453d2397cb3886e4fb59bfdefb55c9f9081e (patch) | |
| tree | 2c3c730e61bb6731bf9c4eb8a8adb17e4efc4887 /chrome/browser/autocomplete | |
| parent | 3cd1f6b0d74cb2f546b430f49af1a91ef951ce95 (diff) | |
| download | chromium_src-b694453d2397cb3886e4fb59bfdefb55c9f9081e.zip chromium_src-b694453d2397cb3886e4fb59bfdefb55c9f9081e.tar.gz chromium_src-b694453d2397cb3886e4fb59bfdefb55c9f9081e.tar.bz2 | |
Make a shared app menu model and update win and mac to use it. Remove the NSMenu from Toolbar.xib.
BUG=22646
TEST=the app menu works as it used to.
Review URL: http://codereview.chromium.org/482006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34561 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/autocomplete')
| -rw-r--r-- | chrome/browser/autocomplete/autocomplete_edit_view_win.cc | 1 | ||||
| -rw-r--r-- | chrome/browser/autocomplete/autocomplete_edit_view_win.h | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_win.cc b/chrome/browser/autocomplete/autocomplete_edit_view_win.cc index 75c9608..c00d5f3 100644 --- a/chrome/browser/autocomplete/autocomplete_edit_view_win.cc +++ b/chrome/browser/autocomplete/autocomplete_edit_view_win.cc @@ -43,7 +43,6 @@ #include "grit/generated_resources.h" #include "net/base/escape.h" #include "skia/ext/skia_utils_win.h" -#include "views/controls/menu/menu_2.h" #include "views/drag_utils.h" #include "views/focus/focus_util_win.h" #include "views/widget/widget.h" diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_win.h b/chrome/browser/autocomplete/autocomplete_edit_view_win.h index 8da5ad1..393ef0a 100644 --- a/chrome/browser/autocomplete/autocomplete_edit_view_win.h +++ b/chrome/browser/autocomplete/autocomplete_edit_view_win.h @@ -22,6 +22,7 @@ #include "chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h" #include "chrome/common/page_transition_types.h" #include "webkit/glue/window_open_disposition.h" +#include "views/controls/menu/menu_2.h" class AutocompletePopupModel; class CommandUpdater; @@ -29,7 +30,6 @@ class Profile; class TabContents; namespace views { class View; -class Menu2; } class AutocompleteEditController; |