Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / cocoa / location_bar / autocomplete_text_field_editor.mm

diff --git a/src/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_editor.mm b/src/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_editor.mm
index a09397f..45b4a01 100644 (file)
--- a/src/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_editor.mm
+++ b/src/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_editor.mm
@@ -12,7 +12,7 @@
 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field.h"
 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.h"
 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
-#include "grit/generated_resources.h"
+#include "chrome/grit/generated_resources.h"
 #import "ui/base/cocoa/find_pasteboard.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 
@@ -486,7 +486,7 @@ BOOL ThePasteboardIsTooDamnBig() {
   if (cmd == @selector(cancelOperation:)) {
     BrowserWindowController* windowController =
         [BrowserWindowController browserWindowControllerForView:self];
-    if ([windowController isFullscreen]) {
+    if ([windowController isInAnyFullscreenMode]) {
       [windowController focusTabContents];
       textChangedByKeyEvents_ = NO;
       return;