Browse Source

Merge branch '1122_cef_mutitab' of http://mayun.itc.cmbchina.cn/QD_RemoteBankArea/LR04.02_RVCTerminalPlus into 1122_cef_mutitab

gifur 4 years ago
parent
commit
f4a7e175b6
2 changed files with 5 additions and 2 deletions
  1. 3 1
      Module/mod_chromium/CModTools.cpp
  2. 2 1
      addin/cmake/DependencyConanFiles.cmake

+ 3 - 1
Module/mod_chromium/CModTools.cpp

@@ -258,7 +258,7 @@ namespace Chromium {
 		cachePath.Append(CSimpleStringA(SPLIT_SLASH_STR)).Append("cefCache_").Append(errType._to_string());
 		errPagePath.Append(" --cache-path=").Append(cachePath);
 		errPagePath.Append(" --magic-str=").Append(m_magicStr.c_str());
-		errPagePath.Append(" --no-sandbox").Append(" --hide-controls");
+		errPagePath.Append(" --no-sandbox").Append(" --hide-controls").Append(" --hide-tabs");
 #if (defined _WIN32 || defined _WIN64)
 		errPagePath.Append(" --top=-1");
 #else
@@ -412,6 +412,7 @@ namespace Chromium {
 		strCmdLine.Append(" --cache-path=").Append(cachePath);
 		strCmdLine.Append(" --no-sandbox");
 		strCmdLine.Append(" --hide-controls");
+		strCmdLine.Append(" --hide-tabs");
 		strCmdLine.Append(" --logextend=").Append((+PAGE_TYPE::Ad)._to_string());
 #if (defined _WIN32 || defined _WIN64)
 		strCmdLine.Append(" --top=-1");
@@ -448,6 +449,7 @@ namespace Chromium {
 		strCmdLine.Append(" --cache-path=").Append(cachePath);
 		strCmdLine.Append(" --no-sandbox");
 		strCmdLine.Append(" --hide-controls");
+		strCmdLine.Append(" --hide-tabs");
 		if (isExtend)
 		{
 			strCmdLine.Append(" --with-tab");

+ 2 - 1
addin/cmake/DependencyConanFiles.cmake

@@ -22,7 +22,8 @@ set(CONAN_ALLPLATFORM_LIB_NAMES
 	#mod_CustMngrAuth mod_uplog
 	jsoncpp/1.9.0@LR04.02_ThirdParty/stable # !!!!support build missing!!!!
 	#mod_chromium
-	cefclient_mutable/2.0@LR04.02_ThirdParty/testing   
+	#cefclient_mutable/2.0@LR04.02_ThirdParty/testing   
+	cefclient_mutable/4.0@LR04.02_ThirdParty/testing
 	#mod_chromium mod_RomoteController mod_rpc
 	boost/1.69.0@LR04.02_ThirdParty/testing
 	#liblog4vendor