diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-25 04:53:09 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-25 04:53:09 +0000 |
| commit | 3fe4381580b1cf5ed2637aeb6bea25e86e1db9b4 (patch) | |
| tree | de2ed77b84e67b6453a169eaf9ee5dcede0a5d8c /chrome/app/nibs | |
| parent | ff71e6483669362f5060598214afc1a594427bce (diff) | |
| download | chromium_src-3fe4381580b1cf5ed2637aeb6bea25e86e1db9b4.zip chromium_src-3fe4381580b1cf5ed2637aeb6bea25e86e1db9b4.tar.gz chromium_src-3fe4381580b1cf5ed2637aeb6bea25e86e1db9b4.tar.bz2 | |
Revert 98112
BrowserKeyEventsTest.ReservedAccelerators started failing, and this looks
like the most likely candidate in the window:
http://build.chromium.org/p/chromium/builders/Mac%2010.6%20Tests%20%28dbg%29%281%29/builds/14075
http://build.chromium.org/p/chromium/builders/Mac%2010.5%20Tests%20%28dbg%29%281%29/builds/12226
- Handle keyboard shortcuts in Mac Panels.
Common code from browser_window_cocoa separated into cocoa/browser_window_utils.
Panel.xib changed to make the NSWindow for the PanelWindowControllerCocoa a ChromeEventProcessingWindow.
BUG=None
TEST=Manual testing with Panels and keyboard shortcuts to find/next/previous/close window/quit chrome.
Review URL: http://codereview.chromium.org/7719016
TBR=jennb@chromium.org
Review URL: http://codereview.chromium.org/7747011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98186 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/nibs')
| -rw-r--r-- | chrome/app/nibs/Panel.xib | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/chrome/app/nibs/Panel.xib b/chrome/app/nibs/Panel.xib index f2a2561..b84b375 100644 --- a/chrome/app/nibs/Panel.xib +++ b/chrome/app/nibs/Panel.xib @@ -12,8 +12,8 @@ </object> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="1"/> <integer value="6"/> + <integer value="1"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -45,7 +45,7 @@ <string key="NSWindowRect">{{196, 240}, {480, 270}}</string> <int key="NSWTFlags">544736256</int> <string key="NSWindowTitle">Window</string> - <string key="NSWindowClass">ChromeEventProcessingWindow</string> + <string key="NSWindowClass">NSWindow</string> <nil key="NSViewClass"/> <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string> <object class="NSView" key="NSWindowView" id="1006"> @@ -205,14 +205,6 @@ <object class="NSMutableArray" key="referencedPartialClassDescriptions"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="IBPartialClassDescription"> - <string key="className">ChromeEventProcessingWindow</string> - <string key="superclassName">NSWindow</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBUserSource</string> - <string key="minorKey"/> - </object> - </object> - <object class="IBPartialClassDescription"> <string key="className">FirstResponder</string> <string key="superclassName">NSObject</string> <object class="NSMutableDictionary" key="actions"> |