diff options
| author | avi@google.com <avi@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-27 18:11:29 +0000 |
|---|---|---|
| committer | avi@google.com <avi@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-27 18:11:29 +0000 |
| commit | f3c8c0e7caa8fca385a75f3dd5a929fa9aa9f7db (patch) | |
| tree | 50ed2e6c5756eaa2c6a484cd0d1148b150ca9d74 | |
| parent | a1997505586b28c7c0a0718943ad533799017424 (diff) | |
| download | chromium_src-f3c8c0e7caa8fca385a75f3dd5a929fa9aa9f7db.zip chromium_src-f3c8c0e7caa8fca385a75f3dd5a929fa9aa9f7db.tar.gz chromium_src-f3c8c0e7caa8fca385a75f3dd5a929fa9aa9f7db.tar.bz2 | |
Now that we have file dialogs, we might as well hook up "Open File" on the Mac.
Review URL: http://codereview.chromium.org/93145
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14625 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/app/nibs/en.lproj/MainMenu.xib | 12 | ||||
| -rw-r--r-- | chrome/browser/browser.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/browser.h | 2 |
3 files changed, 11 insertions, 7 deletions
diff --git a/chrome/app/nibs/en.lproj/MainMenu.xib b/chrome/app/nibs/en.lproj/MainMenu.xib index a9751c2..e955549 100644 --- a/chrome/app/nibs/en.lproj/MainMenu.xib +++ b/chrome/app/nibs/en.lproj/MainMenu.xib @@ -8,6 +8,7 @@ <string key="IBDocument.HIToolboxVersion">353.00</string> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> + <integer value="81"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -237,6 +238,7 @@ <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="353210768"/> <reference key="NSMixedImage" ref="549394948"/> + <int key="NSTag">40000</int> </object> <object class="NSMenuItem" id="165127946"> <reference key="NSMenu" ref="720053764"/> @@ -1523,6 +1525,14 @@ </object> <int key="connectionID">552</int> </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">commandDispatch:</string> + <reference key="source" ref="1014"/> + <reference key="destination" ref="722745758"/> + </object> + <int key="connectionID">553</int> + </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> <object class="NSArray" key="orderedObjects"> @@ -2862,7 +2872,7 @@ </object> </object> <nil key="sourceID"/> - <int key="maxID">552</int> + <int key="maxID">553</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc index 50f1eae..ac6701a 100644 --- a/chrome/browser/browser.cc +++ b/chrome/browser/browser.cc @@ -1016,7 +1016,6 @@ void Browser::FocusSearch() { window_->GetLocationBar()->FocusSearch(); } -#if defined(OS_WIN) || defined(OS_LINUX) void Browser::OpenFile() { UserMetrics::RecordAction(L"OpenFile", profile_); if (!select_file_dialog_.get()) @@ -1029,7 +1028,6 @@ void Browser::OpenFile() { NULL, 0, FILE_PATH_LITERAL(""), parent_window, NULL); } -#endif #if defined(OS_WIN) void Browser::OpenCreateShortcutsDialog() { @@ -1328,9 +1326,7 @@ void Browser::ExecuteCommandWithDisposition( case IDC_FOCUS_SEARCH: FocusSearch(); break; // Show various bits of UI -#if defined(OS_WIN)|| defined(OS_LINUX) case IDC_OPEN_FILE: OpenFile(); break; -#endif #if defined(OS_WIN) case IDC_CREATE_SHORTCUTS: OpenCreateShortcutsDialog(); break; case IDC_DEBUGGER: OpenDebuggerWindow(); break; diff --git a/chrome/browser/browser.h b/chrome/browser/browser.h index bfb1050..a6c5322 100644 --- a/chrome/browser/browser.h +++ b/chrome/browser/browser.h @@ -347,9 +347,7 @@ class Browser : public TabStripModelDelegate, void FocusSearch(); // Show various bits of UI -#if defined(OS_WIN) || defined(OS_LINUX) void OpenFile(); -#endif #if defined(OS_WIN) void OpenCreateShortcutsDialog(); void OpenDebuggerWindow(); |