[NextBrowser] History page hybridnavigation

Change-Id: I7c7dcb5a2e55c0a3c4c15ac03d7b005d6cabe1e1
Signed-off-by: shubham.garg <shubham.garg@samsung.com>

diff --git a/chrome/browser/resources/history/history.ts b/chrome/browser/resources/history/history.ts
index 70742f191d94b436b8be1d55f4c2549d753d66b7..8283e10ed4168e5dfdd31cd209c12298afb0a25f 100644 (file)
--- a/chrome/browser/resources/history/history.ts
+++ b/chrome/browser/resources/history/history.ts
@@ -21,3 +21,5 @@ export {HistorySearchedLabelElement} from './searched_label.js';
 export {HistorySideBarElement} from './side_bar.js';
 export {HistorySyncedDeviceCardElement} from './synced_device_card.js';
 export {HistorySyncedDeviceManagerElement} from './synced_device_manager.js';
+import { HybridNavigation } from 'chrome://resources/js/samsung/hybridnavigation.js';
+setTimeout(HybridNavigation,1250);
\ No newline at end of file

diff --git a/chrome/browser/resources/history/history_list.html b/chrome/browser/resources/history/history_list.html
index 67df89fc9c34dba60ce0a46136dd8b5a75202627..38a7752930c93a7afed058f0da6511313e2bb240 100644 (file)
--- a/chrome/browser/resources/history/history_list.html
+++ b/chrome/browser/resources/history/history_list.html
@@ -46,7 +46,7 @@
 
     <cr-lazy-render id="dialog">
       <template>
-        <cr-dialog consume-keydown-event>
+        <cr-dialog consume-keydown-event class="historyDeletePopup">
           <div slot="title" id="title">$i18n{removeSelected}</div>
           <div slot="body" id="body">$i18n{deleteWarning}</div>
           <div slot="button-container">

diff --git a/chrome/browser/resources/history/history_list.ts b/chrome/browser/resources/history/history_list.ts
index f04dd21d0d35bec05e1def491105a13356073c8b..e7d46746fbb9c019755921a54e7a85be1a1c885d 100644 (file)
--- a/chrome/browser/resources/history/history_list.ts
+++ b/chrome/browser/resources/history/history_list.ts
@@ -27,6 +27,7 @@ import {BROWSING_GAP_TIME} from './constants.js';
 import {HistoryEntry, HistoryQuery, QueryState} from './externs.js';
 import {HistoryItemElement, searchResultsTitle} from './history_item.js';
 import {getTemplate} from './history_list.html.js';
+import {changeIsPopUpOpened} from 'chrome://resources/js/samsung/hybridnavigation.js';
 
 export interface ActionMenuModel {
   index: number;
@@ -361,6 +362,7 @@ export class HistoryListElement extends HistoryListElementBase {
     const dialog = this.$.dialog.getIfExists();
     assert(dialog);
     dialog.close();
+    changeIsPopUpOpened('close');
   }
 
   private onDialogCancelClick_() {
@@ -369,6 +371,7 @@ export class HistoryListElement extends HistoryListElementBase {
     const dialog = this.$.dialog.getIfExists();
     assert(dialog);
     dialog.close();
+    changeIsPopUpOpened('close');
   }
 
   /**

diff --git a/chrome/browser/ui/samsung/hybrid_navigation_controller.cc b/chrome/browser/ui/samsung/hybrid_navigation_controller.cc
index 1d49e3d8e027d80025fa8a9cb9b90b461362b87a..77dc5e7b4fd417b3ac1576b76259a647e1c644f8 100644 (file)
--- a/chrome/browser/ui/samsung/hybrid_navigation_controller.cc
+++ b/chrome/browser/ui/samsung/hybrid_navigation_controller.cc
@@ -795,7 +795,10 @@ bool HybridNavigationController::isInternalPage() {
       LOG(INFO) << "Sub Settings Page";
       return true;
     }
-
+    if (url.rfind(u"chrome://history", 0) == 0) {
+      LOG(INFO) << "Sub history Page";
+      return true;
+    }
   return false;
 }
 

diff --git a/chrome/browser/ui/webui/history/history_ui.cc b/chrome/browser/ui/webui/history/history_ui.cc
index 07a60cd066ef799d452bcd695a2b5ccf81def313..57fa7d39c50202783600415e4c7476dd6ea78984 100644 (file)
--- a/chrome/browser/ui/webui/history/history_ui.cc
+++ b/chrome/browser/ui/webui/history/history_ui.cc
@@ -56,6 +56,10 @@
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/webui/web_ui_util.h"
 
+#if defined(SAMSUNG_NEXT_BROWSER)
+#include "chrome/browser/ui/webui/samsung/samsung_featured_handler.h"
+#endif
+
 namespace {
 
 constexpr char kIsUserSignedInKey[] = "isUserSignedIn";
@@ -195,6 +199,10 @@ HistoryUI::HistoryUI(content::WebUI* web_ui)
   browsing_history_handler_ptr->StartQueryHistory();
   web_ui->AddMessageHandler(std::make_unique<MetricsHandler>());
 
+  #if defined(SAMSUNG_NEXT_BROWSER)
+   web_ui->AddMessageHandler(std::make_unique<SamsungFeaturedHandler>());
+  #endif
+
   auto foreign_session_handler =
       std::make_unique<browser_sync::ForeignSessionHandler>();
   browser_sync::ForeignSessionHandler* foreign_session_handler_ptr =

diff --git a/ui/webui/resources/js/samsung/hybridnavigation.js b/ui/webui/resources/js/samsung/hybridnavigation.js
index e31da447e4a15a13a2707eb6a5a20690eb881805..405246ed3326ac8360f086f1601a3d315d0318de 100644 (file)
--- a/ui/webui/resources/js/samsung/hybridnavigation.js
+++ b/ui/webui/resources/js/samsung/hybridnavigation.js
@@ -174,6 +174,13 @@ function mutationObserver(targetNodes) {
         // else
         // {
             observer.observe(targetNode, config);
+
+            if(window.location.host == 'history' && targetNode.tagName == "CR-BUTTON"){
+                targetNode.addEventListener('click',()=>{
+                    // refreshList();
+                    changeIsPopUpOpened('historyDeletePopup');
+                });
+            }
         // }
     });
     observer.observe(document,config);
@@ -458,6 +465,7 @@ function hybridEnable(fx=500,fy=80){
     onLoad();
     currentElement = navigableElements[3];
 }
+HybridNavigation.refreshList = refreshList;
 hybridEnable();
 }
 
@@ -469,6 +477,7 @@ function getZoomLevel()
 let changeIsPopUpOpened = function(value)
 {
     popupToOpen = value;
+    HybridNavigation.refreshList();
     //console.log(popupToOpen);
 }
 export{HybridNavigation,changeIsPopUpOpened};
\ No newline at end of file