History: Fix console errors on Android, and add some iOS ifdefs.

chrome/browser/ui/webui/history_ui.cc

 // Copyright (c) 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.
 
 #include "chrome/browser/ui/webui/history_ui.h"
 
 #include <set>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 39 matching lines @@
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "net/base/escape.h"
 #include "sync/protocol/history_delete_directive_specifics.pb.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
 #if defined(OS_ANDROID)
 #include "chrome/browser/ui/android/tab_model/tab_model.h"
 #include "chrome/browser/ui/android/tab_model/tab_model_list.h"
-#else
+#endif
+
+#if !defined(OS_ANDROID) && !defined(OS_IOS)
 #include "chrome/browser/ui/webui/ntp/foreign_session_handler.h"
 #include "chrome/browser/ui/webui/ntp/ntp_login_handler.h"
 #endif
 
 static const char kStringsJsFile[] = "strings.js";
 static const char kHistoryJsFile[] = "history.js";
 static const char kOtherDevicesJsFile[] = "other_devices.js";
 
 // The amount of time to wait for a response from the WebHistoryService.
 static const int kWebHistoryTimeoutSeconds = 3;
@@ skipping 80 matching lines @@
   source->AddBoolean("groupByDomain",
       CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kHistoryEnableGroupByDomain));
   source->SetJsonPath(kStringsJsFile);
   source->AddResourcePath(kHistoryJsFile, IDR_HISTORY_JS);
   source->AddResourcePath(kOtherDevicesJsFile, IDR_OTHER_DEVICES_JS);
   source->SetDefaultResource(IDR_HISTORY_HTML);
   source->SetUseJsonJSFormatV2();
   source->DisableDenyXFrameOptions();
 
-#if !defined(OS_ANDROID)
+#if defined(OS_ANDROID) || defined(OS_IOS)
+  source->AddBoolean("isManagedProfile", false);
+#else
   source->AddBoolean("isManagedProfile",
       ManagedUserServiceFactory::GetForProfile(profile)->ProfileIsManaged());
 #endif
 
   return source;
 }
 
 // Returns a localized version of |visit_time| including a relative
 // indicator (e.g. today, yesterday).
 string16 getRelativeDateLocalized(const base::Time& visit_time) {
@@ skipping 199 matching lines @@
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("removeVisits",
       base::Bind(&BrowsingHistoryHandler::HandleRemoveVisits,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("clearBrowsingData",
       base::Bind(&BrowsingHistoryHandler::HandleClearBrowsingData,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("removeBookmark",
       base::Bind(&BrowsingHistoryHandler::HandleRemoveBookmark,
                  base::Unretained(this)));
-#if !defined(OS_ANDROID)
+#if !defined(OS_ANDROID) && !defined(OS_IOS)
   web_ui()->RegisterMessageCallback("processManagedUrls",
       base::Bind(&BrowsingHistoryHandler::HandleProcessManagedUrls,
                  base::Unretained(this)));
 #endif
 #if defined(ENABLE_MANAGED_USERS)
   web_ui()->RegisterMessageCallback("setManagedUserElevated",
       base::Bind(&BrowsingHistoryHandler::HandleSetElevated,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("getManagedUserElevated",
       base::Bind(&BrowsingHistoryHandler::HandleManagedUserGetElevated,
@@ skipping 190 matching lines @@
       &delete_task_tracker_);
 
   if (web_history) {
     web_history_delete_request_ = web_history->ExpireHistory(
         expire_list,
         base::Bind(&BrowsingHistoryHandler::RemoveWebHistoryComplete,
                    base::Unretained(this)));
   }
 }
 
-#if !defined(OS_ANDROID)
+#if !defined(OS_ANDROID) && !defined(OS_IOS)
 void BrowsingHistoryHandler::HandleProcessManagedUrls(const ListValue* args) {
   bool allow = false;
   if (!args->GetBoolean(0, &allow)) {
     LOG(ERROR) << "Unable to extract boolean argument.";
     web_ui()->CallJavascriptFunction("processingManagedFailed");
     return;
   }
 
   // Check if the managed user is authenticated.
   ManagedUserService* service = ManagedUserServiceFactory::GetForProfile(
@@ skipping 93 matching lines @@
     entry->SetInteger("manualBehavior", manual_behavior);
     entry->SetInteger("inContentPack", !sites.empty());
     result_urls->SetWithoutPathExpansion(it->spec(), entry.release());
   }
   results.Append(result_urls.release());
 
   // Notify the Javascript side that the changes have been commited and that it
   // should update the page.
   web_ui()->CallJavascriptFunction("updateEntries", results);
 }
-#endif  // defined(OS_ANDROID)
+#endif  // !defined(OS_ANDROID) && !defined(OS_IOS)
 
 void BrowsingHistoryHandler::HandleClearBrowsingData(const ListValue* args) {
 #if defined(OS_ANDROID)
   Profile* profile = Profile::FromWebUI(web_ui());
   const TabModel* tab_model =
       TabModelList::GetTabModelWithProfile(profile);
   if (tab_model)
     tab_model->OpenClearBrowsingData();
 #else
   // TODO(beng): This is an improper direct dependency on Browser. Route this
@@ skipping 367 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // HistoryUI
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 HistoryUI::HistoryUI(content::WebUI* web_ui) : WebUIController(web_ui) {
   web_ui->AddMessageHandler(new BrowsingHistoryHandler());
 
-// Android deals with foreign sessions differently.
-#if !defined(OS_ANDROID)
+// On mobile we deal with foreign sessions differently.
+#if !defined(OS_ANDROID) && !defined(OS_IOS)
   if (chrome::search::IsInstantExtendedAPIEnabled()) {
     web_ui->AddMessageHandler(new browser_sync::ForeignSessionHandler());
     web_ui->AddMessageHandler(new NTPLoginHandler());
   }
-#endif  // !defined(OS_ANDROID)
+#endif
 
   // Set up the chrome://history-frame/ source.
   Profile* profile = Profile::FromWebUI(web_ui);
   content::WebUIDataSource::Add(profile, CreateHistoryUIHTMLSource(profile));
 }
 
 // static
 const GURL HistoryUI::GetHistoryURLWithSearchText(const string16& text) {
   return GURL(std::string(chrome::kChromeUIHistoryURL) + "#q=" +
               net::EscapeQueryParamValue(UTF16ToUTF8(text), true));
 }
 
 // static
 base::RefCountedMemory* HistoryUI::GetFaviconResourceBytes(
       ui::ScaleFactor scale_factor) {
   return ResourceBundle::GetSharedInstance().
       LoadDataResourceBytesForScale(IDR_HISTORY_FAVICON, scale_factor);
 }