Use NSApp in preference to [NSApplication sharedApplicaton]

BUG=0
TEST={}
Review URL: http://codereview.chromium.org/207001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26480 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 7 insertions, 9 deletions

diff --git a/chrome/browser/cocoa/browser_window_cocoa.mm b/chrome/browser/cocoa/browser_window_cocoa.mm
index 73a74a0..85b355c 100644
--- a/chrome/browser/cocoa/browser_window_cocoa.mm
+++ b/chrome/browser/cocoa/browser_window_cocoa.mm
@@ -62,8 +62,7 @@ void BrowserWindowCocoa::Activate() {
 }
 
 void BrowserWindowCocoa::FlashFrame() {
-  [[NSApplication sharedApplication]
-      requestUserAttention:NSInformationalRequest];
+  [NSApp requestUserAttention:NSInformationalRequest];
 }
 
 bool BrowserWindowCocoa::IsActive() const {
diff --git a/chrome/browser/cocoa/browser_window_controller.mm b/chrome/browser/cocoa/browser_window_controller.mm
index 371f4e4..9700691 100644
--- a/chrome/browser/cocoa/browser_window_controller.mm
+++ b/chrome/browser/cocoa/browser_window_controller.mm
@@ -392,8 +392,7 @@ willPositionSheet:(NSWindow*)sheet
 
   // If the shift key is down, maximize. Hopefully this should make the
   // "switchers" happy.
-  if ([[[NSApplication sharedApplication] currentEvent] modifierFlags] &
-          NSShiftKeyMask) {
+  if ([[NSApp currentEvent] modifierFlags] & NSShiftKeyMask) {
     return frame;
   }
 
diff --git a/chrome/browser/cocoa/clear_browsing_data_controller.mm b/chrome/browser/cocoa/clear_browsing_data_controller.mm
index 03863f36..1384bac 100644
--- a/chrome/browser/cocoa/clear_browsing_data_controller.mm
+++ b/chrome/browser/cocoa/clear_browsing_data_controller.mm
@@ -65,7 +65,7 @@ class ClearBrowsingObserver : public BrowsingDataRemover::Observer {
 
 // Run application modal.
 - (void)runModalDialog {
-  [[NSApplication sharedApplication] runModalForWindow:[self window]];
+  [NSApp runModalForWindow:[self window]];
 }
 
 - (int)removeMask {
@@ -106,7 +106,7 @@ class ClearBrowsingObserver : public BrowsingDataRemover::Observer {
 // Called when the user clicks the cancel button. All we need to do is stop
 // the modal session.
 - (IBAction)cancel:(id)sender {
-  [[NSApplication sharedApplication] stopModal];
+  [NSApp stopModal];
   [[self window] orderOut:self];
 }
 
@@ -141,7 +141,7 @@ class ClearBrowsingObserver : public BrowsingDataRemover::Observer {
 // Called when the data remover object is done with its work. Close the window.
 // The remover will delete itself. End the modal session at this point.
 - (void)dataRemoverDidFinish {
-  [[NSApplication sharedApplication] stopModal];
+  [NSApp stopModal];
   [[self window] orderOut:self];
   [self setIsClearing:NO];
   remover_ = NULL;
diff --git a/chrome/browser/cocoa/tab_controller_unittest.mm b/chrome/browser/cocoa/tab_controller_unittest.mm
index 5d39aa4..4616a9c 100644
--- a/chrome/browser/cocoa/tab_controller_unittest.mm
+++ b/chrome/browser/cocoa/tab_controller_unittest.mm
@@ -38,7 +38,7 @@
 }
 - (void)mouseTimer:(NSTimer*)timer {
   // Fire the mouseUp to break the TabView drag loop.
-  NSEvent* current = [[NSApplication sharedApplication] currentEvent];
+  NSEvent* current = [NSApp currentEvent];
   NSWindow* window = [timer userInfo];
   NSEvent* up = [NSEvent mouseEventWithType:NSLeftMouseUp
                                    location:[current locationInWindow]
@@ -180,7 +180,7 @@ TEST_F(TabControllerTest, UserSelection) {
                                  selector:@selector(mouseTimer:)
                                  userInfo:window
                                   repeats:NO];
-  NSEvent* current = [[NSApplication sharedApplication] currentEvent];
+  NSEvent* current = [NSApp currentEvent];
   NSPoint click_point = NSMakePoint(frame.size.width / 2,
                                     frame.size.height / 2);
   NSEvent* down = [NSEvent mouseEventWithType:NSLeftMouseDown