Merge 62930 - Fix one-time version check for Mac plugin IME...

chrome/browser/renderer_host/render_widget_host_view_mac.mm

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <QuartzCore/QuartzCore.h>
 
 #include "chrome/browser/renderer_host/render_widget_host_view_mac.h"
 
 #include "chrome/browser/chrome_thread.h"
 #include "app/app_switches.h"
@@ skipping 2500 matching lines @@
   if (pluginImeIdentifier_ == -1)
     return false;
 
   // ComplexTextInputPanel only works on 10.6+.
   static BOOL sImeSupported = NO;
   static BOOL sHaveCheckedSupport = NO;
   if (!sHaveCheckedSupport) {
     int32 major, minor, bugfix;
     base::SysInfo::OperatingSystemVersionNumbers(&major, &minor, &bugfix);
     sImeSupported = major > 10 || (major == 10 && minor > 5);
+    sHaveCheckedSupport = YES;
   }
   if (!sImeSupported)
     return false;
 
   ComplexTextInputPanel* inputPanel =
       [ComplexTextInputPanel sharedComplexTextInputPanel];
   NSString* composited_string = nil;
   BOOL handled = [inputPanel interpretKeyEvent:event
                                         string:&composited_string];
   if (composited_string) {
@@ skipping 55 matching lines @@
   if (!string) return NO;
 
   // If the user is currently using an IME, confirm the IME input,
   // and then insert the text from the service, the same as TextEdit and Safari.
   [self confirmComposition];
   [self insertText:string];
   return YES;
 }
 
 @end