| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/webui/browsing_history_handler.h" | 5 #include "chrome/browser/ui/webui/browsing_history_handler.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <set> | 9 #include <set> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 50 #include "chrome/browser/supervised_user/supervised_user_service_factory.h" | 50 #include "chrome/browser/supervised_user/supervised_user_service_factory.h" |
| 51 #include "chrome/browser/supervised_user/supervised_user_url_filter.h" | 51 #include "chrome/browser/supervised_user/supervised_user_url_filter.h" |
| 52 #endif | 52 #endif |
| 53 | 53 |
| 54 #if defined(OS_ANDROID) | 54 #if defined(OS_ANDROID) |
| 55 #include "chrome/browser/android/preferences/preferences_launcher.h" | 55 #include "chrome/browser/android/preferences/preferences_launcher.h" |
| 56 #else | 56 #else |
| 57 #include "chrome/common/chrome_features.h" | 57 #include "chrome/common/chrome_features.h" |
| 58 #endif | 58 #endif |
| 59 | 59 |
| 60 class SupervisedUserService; |
| 61 |
| 60 using bookmarks::BookmarkModel; | 62 using bookmarks::BookmarkModel; |
| 61 | 63 |
| 62 namespace { | 64 namespace { |
| 63 | 65 |
| 64 // Identifiers for the type of device from which a history entry originated. | 66 // Identifiers for the type of device from which a history entry originated. |
| 65 static const char kDeviceTypeLaptop[] = "laptop"; | 67 static const char kDeviceTypeLaptop[] = "laptop"; |
| 66 static const char kDeviceTypePhone[] = "phone"; | 68 static const char kDeviceTypePhone[] = "phone"; |
| 67 static const char kDeviceTypeTablet[] = "tablet"; | 69 static const char kDeviceTypeTablet[] = "tablet"; |
| 68 | 70 |
| 69 // Returns a localized version of |visit_time| including a relative | 71 // Returns a localized version of |visit_time| including a relative |
| (...skipping 462 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 532 web_ui()->CallJavascriptFunctionUnsafe("historyDeleted"); | 534 web_ui()->CallJavascriptFunctionUnsafe("historyDeleted"); |
| 533 } | 535 } |
| 534 | 536 |
| 535 void BrowsingHistoryHandler::HasOtherFormsOfBrowsingHistory( | 537 void BrowsingHistoryHandler::HasOtherFormsOfBrowsingHistory( |
| 536 bool has_other_forms, | 538 bool has_other_forms, |
| 537 bool has_synced_results) { | 539 bool has_synced_results) { |
| 538 web_ui()->CallJavascriptFunctionUnsafe("showNotification", | 540 web_ui()->CallJavascriptFunctionUnsafe("showNotification", |
| 539 base::Value(has_synced_results), | 541 base::Value(has_synced_results), |
| 540 base::Value(has_other_forms)); | 542 base::Value(has_other_forms)); |
| 541 } | 543 } |
| OLD | NEW |