Replaces find pasteboard with a static variable in Find in page.

ios/chrome/browser/find_in_page/find_in_page_controller.mm

 // Copyright 2012 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.
 
 #import "ios/chrome/browser/find_in_page/find_in_page_controller.h"
 
 #import <UIKit/UIKit.h>
 
 #import <cmath>
 #include <memory>
@@ skipping 12 matching lines @@
 #import "ios/web/public/web_state/web_state_observer_bridge.h"
 
 NSString* const kFindBarTextFieldWillBecomeFirstResponderNotification =
     @"kFindBarTextFieldWillBecomeFirstResponderNotification";
 NSString* const kFindBarTextFieldDidResignFirstResponderNotification =
     @"kFindBarTextFieldDidResignFirstResponderNotification";
 
 namespace {
 // The delay (in secs) after which the find in page string will be pumped again.
 const NSTimeInterval kRecurringPumpDelay = .01;
+
+static NSString* staticSearchTerm;

[Eugene But (OOO till 7-30), 2016/08/16 16:34:44]

This should have comments per Objective-C Style Guide. Would be great to explain
that variable is used for sharing search term between different tabs.

[Eugene But (OOO till 7-30), 2016/08/16 16:34:45]

Please prefix globals with |g|, not with |static|:
go/objc-style?showone=Variable_Names&cl=head#Variable_Names

But maybe instead of global you should have a class static variable?

[stkhapugin, 2016/08/16 16:45:57]

There are no class variables in ObjC. Renaming done.

[stkhapugin, 2016/08/16 16:45:57]

Done.

[Eugene But (OOO till 7-30), 2016/08/16 16:53:10]

This is a class variable, no?
@interface FindInPageController () <DOMAltering, CRWWebStateObserver> {
// comments...
static NSString* _searchTerm;
}
@end

 }
 
 @interface FindInPageController () <DOMAltering, CRWWebStateObserver>
 // The find in page controller delegate.
 @property(nonatomic, readonly) id<FindInPageControllerDelegate> delegate;
 // The web view's scroll view.
 @property(nonatomic, readonly) CRWWebViewScrollViewProxy* webViewScrollView;
 
-// Convenience method to obtain UIPasteboardNameFind from UIPasteBoard.
-- (UIPasteboard*)findPasteboard;
+// Sets the search term to |string|. Stored until the application quit.

[Eugene But (OOO till 7-30), 2016/08/16 16:34:45]

Maybe move these comments to static variable so these comments could be as
simple as "Backs up class variable of the same name"?

[stkhapugin, 2016/08/16 16:45:57]

Since there are no class variables, I'll have to keep a free-floating static, I
guess. Or do you mean @interface Blah () { /*ivar declaration list*/ } @end
this?

[Eugene But (OOO till 7-30), 2016/08/16 16:53:11]

Replied above about class variable. If you have global variable instead of class
variable the comments could be "Backs up gSearchTerm variable of the same name."
The point is to have comments in one place.

++ (void)setSearchTerm:(NSString*)string;
+// The search term, stored until the application quit.
++ (NSString*)searchTerm;
+
 // Find in Page text field listeners.
 - (void)findBarTextFieldWillBecomeFirstResponder:(NSNotification*)note;
 - (void)findBarTextFieldDidResignFirstResponder:(NSNotification*)note;
 // Keyboard listeners.
 - (void)keyboardDidShow:(NSNotification*)note;
 - (void)keyboardWillHide:(NSNotification*)note;
 // Constantly injects the find string in page until
 // |disableFindInPageWithCompletionHandler:| is called or the find operation is
 // complete. Calls |completionHandler| if the find operation is complete.
 // |completionHandler| can be nil.
@@ skipping 27 matching lines @@
   // True when a find is in progress. Used to avoid running JavaScript during
   // disable when there is nothing to clear.
   BOOL _findStringStarted;
 
   // Bridge to observe the web state from Objective-C.
   std::unique_ptr<web::WebStateObserverBridge> _webStateObserverBridge;
 }
 
 @synthesize delegate = _delegate;
 
++ (void)setSearchTerm:(NSString*)string {
+  staticSearchTerm = [string copy];
+}
+
++ (NSString*)searchTerm {
+  return staticSearchTerm;
+}
+
 - (id)initWithWebState:(web::WebState*)webState
               delegate:(id<FindInPageControllerDelegate>)delegate {
   self = [super init];
   if (self) {
     DCHECK(delegate);
     _findInPageJsManager = base::mac::ObjCCastStrict<JsFindinpageManager>(
         [webState->GetJSInjectionReceiver()
             instanceOfClass:[JsFindinpageManager class]]);
     _delegate = delegate;
     _webStateObserverBridge.reset(
@@ skipping 181 matching lines @@
   // handler.
   if (_findStringStarted) {
     [_findInPageJsManager disableWithCompletionHandler:handler];
     _findStringStarted = NO;
   } else {
     handler();
   }
 }
 
 - (void)saveSearchTerm {
-  [self findPasteboard].string = [[self findInPageModel] text];
+  [[FindInPageController class] setSearchTerm:[[self findInPageModel] text]];

[Eugene But (OOO till 7-30), 2016/08/16 16:34:45]

s/FindInPageController/self

[stkhapugin, 2016/08/16 16:45:57]

Done.

 }
 
 - (void)restoreSearchTerm {
   // Pasteboards always return nil in background:
   if ([[UIApplication sharedApplication] applicationState] !=
       UIApplicationStateActive) {
     return;
   }
 
-  NSString* term = [self findPasteboard].string;
+  NSString* term = [[FindInPageController class] searchTerm];

[Eugene But (OOO till 7-30), 2016/08/16 16:34:44]

ditto

[stkhapugin, 2016/08/16 16:45:57]

Done.

   [[self findInPageModel] updateQuery:(term ? term : @"") matches:0];
 }
 
 - (UIPasteboard*)findPasteboard {

[Eugene But (OOO till 7-30), 2016/08/16 16:34:44]

Is this still used?

[stkhapugin, 2016/08/16 16:45:57]

No, good catch! Removed.

   return [UIPasteboard pasteboardWithName:UIPasteboardNameFind create:NO];
 }
 
 - (web::WebState*)webState {
   return _webStateObserverBridge ? _webStateObserverBridge->web_state()
                                  : nullptr;
 }
 
 #pragma mark - Notification listeners
 
@@ skipping 61 matching lines @@
 
 - (BOOL)canReleaseDOMLock {
   return NO;
 }
 
 - (void)releaseDOMLockWithCompletionHandler:(ProceduralBlock)completionHandler {
   NOTREACHED();
 }
 
 @end