[NextBrowser] Merging launch url with a new tab to M130

Change-Id: I8bc4f3d71ff1ff86ecb40e7fc9c7d1551a5ac356
Signed-off-by: Harshit Rai <r.harshit@partner.samsung.com>

diff --git a/chrome/app/chrome_main.cc b/chrome/app/chrome_main.cc
index ec159d8256400de088779e9d5e43c8fdfda25a95..67b1244975bd09257461af99b2dff4e4d0a98290 100644 (file)
--- a/chrome/app/chrome_main.cc
+++ b/chrome/app/chrome_main.cc
@@ -274,7 +274,11 @@ void ChromeAppControl(const std::map<std::string, std::string>& keyValuePairs) {
           samsung_browser_main::SamsungBrowserCore::BrowserState::Loaded);
     }
   }
-
+  auto iter_1 = keyValuePairs.find("URL");
+  if (iter_1 != keyValuePairs.end()) {
+    samsung_browser_main::SamsungBrowserCore::instance()->launch(
+        iter_1->second);
+  }
   LOG(INFO) << "ChromeAppControl end";
 }
 

diff --git a/chrome/browser/ui/browser_commands.cc b/chrome/browser/ui/browser_commands.cc
index e5e91af81cd95b2489673bde046fa08df551835e..dd8119a2c72347b6172f45fdb88d76a91f5f49ef 100644 (file)
--- a/chrome/browser/ui/browser_commands.cc
+++ b/chrome/browser/ui/browser_commands.cc
@@ -237,6 +237,7 @@
 
 #if defined(SAMSUNG_NEXT_BROWSER)
 #include "chrome/browser/ui/samsung/samsung_browser_core.h"
+#include "components/url_formatter/url_fixer.h"
 #endif
 
 #if !BUILDFLAG(IS_ANDROID)
@@ -967,7 +968,7 @@ void CloseWindow(Browser* browser) {
   browser->window()->Close();
 }
 
-#if defined(SAMSUNG_MENU_TREE_UI)
+#if defined(SAMSUNG_NEXT_BROWSER)
 void NewTabWithURL(Browser* browser, std::string url) {
   base::RecordAction(UserMetricsAction("NewTab"));
   // TODO(asvitkine): This is invoked programmatically from several places.
@@ -977,11 +978,11 @@ void NewTabWithURL(Browser* browser, std::string url) {
                             NewTabTypes::NEW_TAB_ENUM_COUNT);
 
   if (browser->SupportsWindowFeature(Browser::FEATURE_TABSTRIP)) {
-    AddTabAt(browser, GURL(url), -1, true);
+    AddTabAt(browser, url_formatter::FixupURL(url, ""), -1, true);
   } else {
     ScopedTabbedBrowserDisplayer displayer(browser->profile());
     Browser* b = displayer.browser();
-    AddTabAt(b, GURL(url), -1, true);
+    AddTabAt(b, url_formatter::FixupURL(url, ""), -1, true);
     b->window()->Show();
     // The call to AddBlankTabAt above did not set the focus to the tab as its
     // window was not active, so we have to do it explicitly.

diff --git a/chrome/browser/ui/browser_commands.h b/chrome/browser/ui/browser_commands.h
index 760984f439e3d4b85956c7206cb75615ec18dc1e..622bf8d30b364120df45997f88729b1ab46a9168 100644 (file)
--- a/chrome/browser/ui/browser_commands.h
+++ b/chrome/browser/ui/browser_commands.h
@@ -93,7 +93,7 @@ void Stop(Browser* browser);
 void NewWindow(Browser* browser);
 void NewIncognitoWindow(Profile* profile);
 void CloseWindow(Browser* browser);
-#if defined(SAMSUNG_MENU_TREE_UI)
+#if defined(SAMSUNG_NEXT_BROWSER)
 void NewTabWithURL(Browser* browser, std::string url);
 #endif
 content::WebContents& NewTab(Browser* browser);

diff --git a/chrome/browser/ui/samsung/samsung_browser_core.cc b/chrome/browser/ui/samsung/samsung_browser_core.cc
index f26c7badf055acd2a476cf5e3eb3a35539bd4bc2..90527e15884cd2f72a77cab0844bcd697bd23da1 100644 (file)
--- a/chrome/browser/ui/samsung/samsung_browser_core.cc
+++ b/chrome/browser/ui/samsung/samsung_browser_core.cc
@@ -20,6 +20,7 @@
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "chrome/browser/browser_process.h"
+#include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/samsung/mcf_controller.h"
 #include "chrome/browser/ui/samsung/samsung_web_contents_controller.h"
@@ -343,4 +344,9 @@ void SamsungBrowserCore::RemoveLowMemoryStateObserver(
   m_low_memory_observer_list.RemoveObserver(observer);
 }
 
+void SamsungBrowserCore::launch(std::string url) {
+  if (browser_) {
+    chrome::NewTabWithURL(browser_, url);
+  }
+}
 }  // namespace samsung_browser_main

diff --git a/chrome/browser/ui/samsung/samsung_browser_core.h b/chrome/browser/ui/samsung/samsung_browser_core.h
index 3de6f32958c29d6ec801a7e1bb1fdaca926db374..d080b62e2d4274ce4ee0e7b18bc805c5abd3fa2d 100644 (file)
--- a/chrome/browser/ui/samsung/samsung_browser_core.h
+++ b/chrome/browser/ui/samsung/samsung_browser_core.h
@@ -165,6 +165,7 @@ class SamsungBrowserCore : public BrowserListObserver {
   // BrowserListObserver
   void OnBrowserAdded(Browser* browser) override;
   void OnBrowserRemoved(Browser* browser) override;
+  void launch(std::string url);
 
  private:
   explicit SamsungBrowserCore();

diff --git a/tizen_src/downloadable/browser_app_interface.cc b/tizen_src/downloadable/browser_app_interface.cc
index 9bad6184b6ac2bf37934e870d5d2bcd87278fc58..4a1d597d591861bdb910111714816d6a78383860 100644 (file)
--- a/tizen_src/downloadable/browser_app_interface.cc
+++ b/tizen_src/downloadable/browser_app_interface.cc
@@ -154,6 +154,11 @@ static void browser_control(app_control_h app_control, void* user_data) {
 
   if (browser_received_control) {
     LOG(INFO) << "Browser control already received";
+    if (checker.requestURI.length()) {
+      std::map<std::string, std::string> keyValuePairs = {
+          {"URL", checker.requestURI}};
+      chromeAppControlPtr(keyValuePairs);
+    }
     if (!browser_window_shown) {
       LOG(INFO) << "Showing Preloaded browser";
       browser_window_shown = true;