| Index: chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.mm
|
| diff --git a/chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.mm b/chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.mm
|
| index bd6e6183bdef8b6556b3d3d86a8d109b3fdd4779..082dd0d7e29880c42f793211e48495e5bc283475 100644
|
| --- a/chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.mm
|
| +++ b/chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.mm
|
| @@ -4,8 +4,10 @@
|
|
|
| #import <Cocoa/Cocoa.h>
|
|
|
| +#include "base/auto_reset.h"
|
| #include "base/mac/mac_util.h"
|
| #include "base/sys_string_conversions.h"
|
| +#include "chrome/browser/profiles/profile.h"
|
| #include "chrome/browser/ui/cocoa/browser_window_controller.h"
|
| #import "chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.h"
|
| #import "chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h"
|
| @@ -170,9 +172,12 @@ const float kRightEdgeOffset = 25;
|
| FindTabHelper* find_tab_helper = tab_contents->find_tab_helper();
|
|
|
| NSString* findText = [findText_ stringValue];
|
| - suppressPboardUpdateActions_ = YES;
|
| - [[FindPasteboard sharedInstance] setFindText:findText];
|
| - suppressPboardUpdateActions_ = NO;
|
| + // Only copy typed text to the FindPasteboard for non-incognito windows, see
|
| + // http://crbug.com/85306.
|
| + if (!tab_contents->profile()->IsOffTheRecord()) {
|
| + AutoReset<BOOL> auto_reset(&suppressPboardUpdateActions_, YES);
|
| + [[FindPasteboard sharedInstance] setFindText:findText];
|
| + }
|
|
|
| if ([findText length] > 0) {
|
| find_tab_helper->
|
|
|