Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / cocoa / find_bar / find_bar_cocoa_controller.mm

diff --git a/src/chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.mm b/src/chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.mm
index d2f2ebe..b328234 100644 (file)
--- a/src/chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.mm
+++ b/src/chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.mm
@@ -24,8 +24,7 @@
 #include "chrome/browser/ui/find_bar/find_tab_helper.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
-#include "content/public/browser/web_contents_view.h"
-#import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h"
+#import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSAnimation+Duration.h"
 #import "ui/base/cocoa/find_pasteboard.h"
 #import "ui/base/cocoa/focus_tracker.h"
 
@@ -212,7 +211,7 @@ const float kRightEdgeOffset = 25;
     // The textbox is empty so we reset.
     findTabHelper->StopFinding(FindBarController::kClearSelectionOnPage);
     [self updateUIForFindResult:findTabHelper->find_result()
-                       withText:string16()];
+                       withText:base::string16()];
   }
 }
 
@@ -328,7 +327,7 @@ const float kRightEdgeOffset = 25;
   if (!(focusTracker_.get() &&
         [focusTracker_ restoreFocusInWindow:[findBarView_ window]])) {
     // Fall back to giving focus to the tab contents.
-    findBarBridge_->GetFindBarController()->web_contents()->GetView()->Focus();
+    findBarBridge_->GetFindBarController()->web_contents()->Focus();
   }
   focusTracker_.reset(nil);
 }
@@ -383,11 +382,11 @@ const float kRightEdgeOffset = 25;
 - (void)clearResults:(const FindNotificationDetails&)results {
   // Just call updateUIForFindResult, which will take care of clearing
   // the search text and the results label.
-  [self updateUIForFindResult:results withText:string16()];
+  [self updateUIForFindResult:results withText:base::string16()];
 }
 
 - (void)updateUIForFindResult:(const FindNotificationDetails&)result
-                     withText:(const string16&)findText {
+                     withText:(const base::string16&)findText {
   // If we don't have any results and something was passed in, then
   // that means someone pressed Cmd-G while the Find box was
   // closed. In that case we need to repopulate the Find box with what
@@ -541,7 +540,7 @@ const float kRightEdgeOffset = 25;
     return frame.origin.x;
 
   // Get the size of the container.
-  gfx::Rect containerRect(contents->GetView()->GetContainerSize());
+  gfx::Rect containerRect(contents->GetContainerBounds().size());
 
   // Position the FindBar on the top right corner.
   viewRect.set_x(