diff options
| author | rkc@chromium.org <rkc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-31 07:19:11 +0000 |
|---|---|---|
| committer | rkc@chromium.org <rkc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-31 07:19:11 +0000 |
| commit | acaa37bbf4636288c74fe7515ba3893cc87cff4a (patch) | |
| tree | b065e45cc185bbee835f4051c29ad8a285fdeead /chrome/browser/app_controller_mac.mm | |
| parent | 4daee896cef92ccb21bddc4a952833986f0089e3 (diff) | |
| download | chromium_src-acaa37bbf4636288c74fe7515ba3893cc87cff4a.zip chromium_src-acaa37bbf4636288c74fe7515ba3893cc87cff4a.tar.gz chromium_src-acaa37bbf4636288c74fe7515ba3893cc87cff4a.tar.bz2 | |
Fix saved screenshots for feedback.
Fixed the location where the saved screenshots are picked from. Also fixed the issue with saved screenshots blocking the UI.
R=zelidrag@chromium.org,derat@chromium.org
BUG=chromium-os:18227,chromium:73180
TEST=Tested with sending feedback using a saved screenshot.
Review URL: http://codereview.chromium.org/7635017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98934 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/app_controller_mac.mm')
| -rw-r--r-- | chrome/browser/app_controller_mac.mm | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/chrome/browser/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm index 74d4752..9cf9fb7 100644 --- a/chrome/browser/app_controller_mac.mm +++ b/chrome/browser/app_controller_mac.mm @@ -40,7 +40,6 @@ #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h" #import "chrome/browser/ui/cocoa/browser_window_cocoa.h" #import "chrome/browser/ui/cocoa/browser_window_controller.h" -#import "chrome/browser/ui/cocoa/bug_report_window_controller.h" #import "chrome/browser/ui/cocoa/confirm_quit_panel_controller.h" #import "chrome/browser/ui/cocoa/encoding_menu_controller_delegate_mac.h" #import "chrome/browser/ui/cocoa/history_menu_bridge.h" @@ -743,6 +742,9 @@ const AEEventClass kAECloudPrintUninstallClass = 'GCPu'; sync_ui_util::UpdateSyncItem(item, enable, lastProfile); break; } + case IDC_FEEDBACK: + enable = NO; + break; default: enable = menuState_->IsCommandEnabled(tag) ? [self keyWindowIsNotModal] : NO; @@ -861,17 +863,6 @@ const AEEventClass kAECloudPrintUninstallClass = 'GCPu'; else Browser::OpenHelpWindow(lastProfile); break; - case IDC_FEEDBACK: { - Browser* browser = BrowserList::GetLastActive(); - TabContents* currentTab = - browser ? browser->GetSelectedTabContents() : NULL; - BugReportWindowController* controller = - [[BugReportWindowController alloc] - initWithTabContents:currentTab - profile:[self lastProfile]]; - [controller runModalDialog]; - break; - } case IDC_SYNC_BOOKMARKS: // The profile may be NULL during shutdown -- see // http://code.google.com/p/chromium/issues/detail?id=43048 . |