2 files changed, 10 insertions, 6 deletions
diff --git a/chrome/browser/extensions/extension_bookmark_manager_api.cc b/chrome/browser/extensions/extension_bookmark_manager_api.cc
index 24a01aa..81848f3 100644
--- a/chrome/browser/extensions/extension_bookmark_manager_api.cc
+++ b/chrome/browser/extensions/extension_bookmark_manager_api.cc
@@ -14,6 +14,7 @@
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_html_writer.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
+#include "chrome/browser/dom_ui/chrome_url_data_manager.h"
 #include "chrome/browser/extensions/extension_bookmarks_module_constants.h"
 #include "chrome/browser/extensions/extension_dom_ui.h"
 #include "chrome/browser/extensions/extension_message_service.h"
@@ -385,6 +386,8 @@ bool BookmarkManagerGetStringsFunction::RunImpl() {
   localized_strings->SetString(L"delete",
       l10n_util::GetString(IDS_CONTENT_CONTEXT_DELETE));
 
+  ChromeURLDataManager::DataSource::SetFontAndTextDirection(localized_strings);
+
   result_.reset(localized_strings);
   SendResponse(true);
   return true;
diff --git a/chrome/browser/resources/bookmark_manager/main.html b/chrome/browser/resources/bookmark_manager/main.html
index c8a1f7c..7a1ea2b 100644
--- a/chrome/browser/resources/bookmark_manager/main.html
+++ b/chrome/browser/resources/bookmark_manager/main.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html i18n-values="dir:textdirection">
 <!--
 
 Copyright (c) 2010 The Chromium Authors. All rights reserved.
@@ -310,12 +310,12 @@ if (!chrome.bookmarks)
   window.location.reload();
 
 // Allow platform specific CSS rules.
-if (/Mac/.test(navigator.platform))
+if (cr.isMac)
   document.documentElement.setAttribute('os', 'mac');
 
 </script>
 </head>
-<body>
+<body i18n-values=".style.fontFamily:fontfamily;.style.fontSize:fontsize">
 
 <div class="header">
   <button onclick="resetSearch()" class="logo" tabindex=3></button>
@@ -706,6 +706,10 @@ var dnd = {
     var dragData = this.dragData;
     if (!dragData)
       return false;
+
+    if (this.isOverRecentOrSearch(overElement))
+      return false;
+
     if (!dragData.sameProfile)
       return true;
 
@@ -722,9 +726,6 @@ var dnd = {
     if (overBookmarkNode.id == dragId)
       return false;
 
-    if (this.isOverRecentOrSearch(overElement))
-      return false;
-
     // If we are dragging a folder we cannot drop it on any of its descendants
     var dragBookmarkNode = bmm.treeLookup[dragId];
     if (dragBookmarkNode && bmm.isFolder(dragBookmarkNode) &&