User/chwan/update api (#12)

mrsteamfist · Christopher Wang · web-flow · commit ed196a90d819 · 2020-04-23T14:32:50.000-07:00
* Update enumeration due to api change

* Updated the package and fixed few missed instances

* Updated the readme file too with the api changes

* Added the changes from details ot options in readme

Co-authored-by: Christopher Wang &lt;chwan@microsoft.com&gt;
diff --git a/BrowserWindow.cpp b/BrowserWindow.cpp
@@ -236,24 +236,24 @@ HRESULT BrowserWindow::InitUIWebViews()
 
 HRESULT BrowserWindow::CreateBrowserControlsWebView()
 {
-    return m_uiEnv->CreateCoreWebView2Host(m_hWnd, Callback<ICoreWebView2CreateCoreWebView2HostCompletedHandler>(
-        [this](HRESULT result, ICoreWebView2Host* host) -> HRESULT
+    return m_uiEnv->CreateCoreWebView2Controller(m_hWnd, Callback<ICoreWebView2CreateCoreWebView2ControllerCompletedHandler>(
+        [this](HRESULT result, ICoreWebView2Controller* host) -> HRESULT
     {
         if (!SUCCEEDED(result))
         {
             OutputDebugString(L"Controls WebView creation failed\n");
             return result;
         }
         // WebView created
-        m_controlsHost = host;
-        CheckFailure(m_controlsHost->get_CoreWebView2(&m_controlsWebView), L"");
+        m_controlsController = host;
+        CheckFailure(m_controlsController->get_CoreWebView2(&m_controlsWebView), L"");
 
         wil::com_ptr<ICoreWebView2Settings> settings;
         RETURN_IF_FAILED(m_controlsWebView->get_Settings(&settings));
         RETURN_IF_FAILED(settings->put_AreDevToolsEnabled(FALSE));
 
-        RETURN_IF_FAILED(m_controlsHost->add_ZoomFactorChanged(Callback<ICoreWebView2ZoomFactorChangedEventHandler>(
-            [](ICoreWebView2Host* host, IUnknown* args) -> HRESULT
+        RETURN_IF_FAILED(m_controlsController->add_ZoomFactorChanged(Callback<ICoreWebView2ZoomFactorChangedEventHandler>(
+            [](ICoreWebView2Controller* host, IUnknown* args) -> HRESULT
         {
             host->put_ZoomFactor(1.0);
             return S_OK;
@@ -272,37 +272,37 @@ HRESULT BrowserWindow::CreateBrowserControlsWebView()
 
 HRESULT BrowserWindow::CreateBrowserOptionsWebView()
 {
-    return m_uiEnv->CreateCoreWebView2Host(m_hWnd, Callback<ICoreWebView2CreateCoreWebView2HostCompletedHandler>(
-        [this](HRESULT result, ICoreWebView2Host* host) -> HRESULT
+    return m_uiEnv->CreateCoreWebView2Controller(m_hWnd, Callback<ICoreWebView2CreateCoreWebView2ControllerCompletedHandler>(
+        [this](HRESULT result, ICoreWebView2Controller* host) -> HRESULT
     {
         if (!SUCCEEDED(result))
         {
             OutputDebugString(L"Options WebView creation failed\n");
             return result;
         }
         // WebView created
-        m_optionsHost = host;
-        CheckFailure(m_optionsHost->get_CoreWebView2(&m_optionsWebView), L"");
+        m_optionsController = host;
+        CheckFailure(m_optionsController->get_CoreWebView2(&m_optionsWebView), L"");
 
         wil::com_ptr<ICoreWebView2Settings> settings;
         RETURN_IF_FAILED(m_optionsWebView->get_Settings(&settings));
         RETURN_IF_FAILED(settings->put_AreDevToolsEnabled(FALSE));
 
-        RETURN_IF_FAILED(m_optionsHost->add_ZoomFactorChanged(Callback<ICoreWebView2ZoomFactorChangedEventHandler>(
-            [](ICoreWebView2Host* host, IUnknown* args) -> HRESULT
+        RETURN_IF_FAILED(m_optionsController->add_ZoomFactorChanged(Callback<ICoreWebView2ZoomFactorChangedEventHandler>(
+            [](ICoreWebView2Controller* host, IUnknown* args) -> HRESULT
         {
             host->put_ZoomFactor(1.0);
             return S_OK;
         }
         ).Get(), &m_optionsZoomToken));
 
         // Hide by default
-        RETURN_IF_FAILED(m_optionsHost->put_IsVisible(FALSE));
+        RETURN_IF_FAILED(m_optionsController->put_IsVisible(FALSE));
         RETURN_IF_FAILED(m_optionsWebView->add_WebMessageReceived(m_uiMessageBroker.Get(), &m_optionsUIMessageBrokerToken));
 
         // Hide menu when focus is lost
-        RETURN_IF_FAILED(m_optionsHost->add_LostFocus(Callback<ICoreWebView2FocusChangedEventHandler>(
-            [this](ICoreWebView2Host* sender, IUnknown* args) -> HRESULT
+        RETURN_IF_FAILED(m_optionsController->add_LostFocus(Callback<ICoreWebView2FocusChangedEventHandler>(
+            [this](ICoreWebView2Controller* sender, IUnknown* args) -> HRESULT
         {
             web::json::value jsonObj = web::json::value::parse(L"{}");
             jsonObj[L"message"] = web::json::value(MG_OPTIONS_LOST_FOCUS);
@@ -363,7 +363,7 @@ void BrowserWindow::SetUIMessageBroker()
             }
             else
             {
-                m_tabs.at(id)->m_contentHost->Close();
+                m_tabs.at(id)->m_contentController->Close();
                 it->second = std::move(newTab);
             }
         }
@@ -428,7 +428,7 @@ void BrowserWindow::SetUIMessageBroker()
         case MG_CLOSE_TAB:
         {
             size_t id = args.at(L"tabId").as_number().to_uint32();
-            m_tabs.at(id)->m_contentHost->Close();
+            m_tabs.at(id)->m_contentController->Close();
             m_tabs.erase(id);
         }
         break;
@@ -439,18 +439,18 @@ void BrowserWindow::SetUIMessageBroker()
         break;
         case MG_SHOW_OPTIONS:
         {
-            CheckFailure(m_optionsHost->put_IsVisible(TRUE), L"");
-            m_optionsHost->MoveFocus(CORE_WEBVIEW2_MOVE_FOCUS_REASON_PROGRAMMATIC);
+            CheckFailure(m_optionsController->put_IsVisible(TRUE), L"");
+            m_optionsController->MoveFocus(COREWEBVIEW2_MOVE_FOCUS_REASON_PROGRAMMATIC);
         }
         break;
         case MG_HIDE_OPTIONS:
         {
-            CheckFailure(m_optionsHost->put_IsVisible(FALSE), L"Something went wrong when trying to close the options dropdown.");
+            CheckFailure(m_optionsController->put_IsVisible(FALSE), L"Something went wrong when trying to close the options dropdown.");
         }
         break;
         case MG_OPTION_SELECTED:
         {
-            m_tabs.at(m_activeTabId)->m_contentHost->MoveFocus(CORE_WEBVIEW2_MOVE_FOCUS_REASON_PROGRAMMATIC);
+            m_tabs.at(m_activeTabId)->m_contentController->MoveFocus(COREWEBVIEW2_MOVE_FOCUS_REASON_PROGRAMMATIC);
         }
         break;
         case MG_GET_FAVORITES:
@@ -480,12 +480,12 @@ HRESULT BrowserWindow::SwitchToTab(size_t tabId)
     size_t previousActiveTab = m_activeTabId;
 
     RETURN_IF_FAILED(m_tabs.at(tabId)->ResizeWebView());
-    RETURN_IF_FAILED(m_tabs.at(tabId)->m_contentHost->put_IsVisible(TRUE));
+    RETURN_IF_FAILED(m_tabs.at(tabId)->m_contentController->put_IsVisible(TRUE));
     m_activeTabId = tabId;
 
     if (previousActiveTab != INVALID_TAB_ID && previousActiveTab != m_activeTabId)
     {
-        RETURN_IF_FAILED(m_tabs.at(previousActiveTab)->m_contentHost->put_IsVisible(FALSE));
+        RETURN_IF_FAILED(m_tabs.at(previousActiveTab)->m_contentController->put_IsVisible(FALSE));
     }
 
     return S_OK;
@@ -824,7 +824,7 @@ HRESULT BrowserWindow::ResizeUIWebViews()
         bounds.bottom = bounds.top + GetDPIAwareBound(c_uiBarHeight);
         bounds.bottom += 1;
 
-        RETURN_IF_FAILED(m_controlsHost->put_Bounds(bounds));
+        RETURN_IF_FAILED(m_controlsController->put_Bounds(bounds));
     }
 
     if (m_optionsWebView != nullptr)
@@ -835,7 +835,7 @@ HRESULT BrowserWindow::ResizeUIWebViews()
         bounds.bottom = bounds.top + GetDPIAwareBound(c_optionsDropdownHeight);
         bounds.left = bounds.right - GetDPIAwareBound(c_optionsDropdownWidth);
 
-        RETURN_IF_FAILED(m_optionsHost->put_Bounds(bounds));
+        RETURN_IF_FAILED(m_optionsController->put_Bounds(bounds));
     }
 
     // Workaround for black controls WebView issue in Windows 7
diff --git a/BrowserWindow.h b/BrowserWindow.h
@@ -42,8 +42,8 @@ class BrowserWindow
 
     Microsoft::WRL::ComPtr<ICoreWebView2Environment> m_uiEnv;
     Microsoft::WRL::ComPtr<ICoreWebView2Environment> m_contentEnv;
-    Microsoft::WRL::ComPtr<ICoreWebView2Host> m_controlsHost;
-    Microsoft::WRL::ComPtr<ICoreWebView2Host> m_optionsHost;
+    Microsoft::WRL::ComPtr<ICoreWebView2Controller> m_controlsController;
+    Microsoft::WRL::ComPtr<ICoreWebView2Controller> m_optionsController;
     Microsoft::WRL::ComPtr<ICoreWebView2> m_controlsWebView;
     Microsoft::WRL::ComPtr<ICoreWebView2> m_optionsWebView;
     std::map<size_t,std::unique_ptr<Tab>> m_tabs;
diff --git a/README.md b/README.md
@@ -86,14 +86,14 @@ WebView2Browser makes use of a handful of the APIs available in WebView2. For th
 
 API | Feature(s)
 :--- | :---
-CreateCoreWebView2EnvironmentWithDetails | Used to create the environments for UI and content WebViews. Different user data directories are passed to isolate UI from web content. |
+CreateCoreWebView2EnvironmentWithOptions | Used to create the environments for UI and content WebViews. Different user data directories are passed to isolate UI from web content. |
 ICoreWebView2 | There are several WebViews in WebView2Browser and most features make use of members in this interface, the table below shows how they're used.
 ICoreWebView2DevToolsProtocolEventReceivedEventHandler | Used along with add_DevToolsProtocolEventReceived to listen for CDP security events to update the lock icon in the browser UI. |
 ICoreWebView2DevToolsProtocolEventReceiver | Used along with add_DevToolsProtocolEventReceived to listen for CDP security events to update the lock icon in the browser UI. |
 ICoreWebView2ExecuteScriptCompletedHandler | Used along with ExecuteScript to get the title and favicon from the visited page. |
 ICoreWebView2FocusChangedEventHandler | Used along with add_LostFocus to hide the browser options dropdown when it loses focus.
 ICoreWebView2HistoryChangedEventHandler | Used along with add_HistoryChanged to udpate the navigation buttons in the browser UI. |
-ICoreWebView2Host | There are several WebViewHosts in WebView2Browser and we fetch the associated WebViews from them.
+ICoreWebView2Controller | There are several WebViewControllers in WebView2Browser and we fetch the associated WebViews from them.
 ICoreWebView2NavigationCompletedEventHandler | Used along with add_NavigationCompleted to udpate the reload button in the browser UI.
 ICoreWebView2Settings | Used to disable DevTools in the browser UI.
 ICoreWebView2SourceChangedEventHandler | Used along with add_SourceChanged to udpate the address bar in the browser UI. |
@@ -110,9 +110,9 @@ PostWebMessageAsJson | Used to communicate WebViews. All messages use JSON to pa
 add_WebMessageReceived | Used to handle web messages posted to the WebView.
 CallDevToolsProtocolMethod | Used to enable listening for security events, which will notify of security status changes in a document.
 
-ICoreWebView2Host API | Feature(s)
+ICoreWebView2Controller API | Feature(s)
 :--- | :---
-get_CoreWebView2 | Used to get the CoreWebView2 associated with this CoreWebView2Host.
+get_CoreWebView2 | Used to get the CoreWebView2 associated with this CoreWebView2Controller.
 add_LostFocus | Used to hide the options dropdown when the user clicks away of it.
 <br />
 
@@ -133,7 +133,7 @@ The sections below describe how some of the features in WebView2Browser were imp
 
 ## The basics
 ### Set up the environment, create a WebView
-WebView2 allows you to host web content in your Windows app. It exposes the globals [CreateCoreWebView2Environment](https://docs.microsoft.com/microsoft-edge/hosting/webview2/reference/webview2.idl#createcorewebview2environment) and [CreateCoreWebView2EnvironmentWithDetails](https://docs.microsoft.com/microsoft-edge/hosting/webview2/reference/webview2.idl#createcorewebview2environmentwithdetails) from which we can create the two separate environments for the browser's UI and content.
+WebView2 allows you to host web content in your Windows app. It exposes the globals [CreateCoreWebView2Environment](https://docs.microsoft.com/microsoft-edge/hosting/webview2/reference/webview2.idl#createcorewebview2environment) and [CreateCoreWebView2EnvironmentWithOptions](https://docs.microsoft.com/microsoft-edge/hosting/webview2/reference/webview2.idl#createcorewebview2environmentwithoptions) from which we can create the two separate environments for the browser's UI and content.
 
 ```cpp
     // Get directory for user data. This will be kept separated from the
@@ -145,7 +145,7 @@ WebView2 allows you to host web content in your Windows app. It exposes the glob
     // tabs will be created from this environment and kept isolated from the
     // browser UI. This enviroment is created first so the UI can request new
     // tabs when it's ready.
-    HRESULT hr = CreateCoreWebView2EnvironmentWithDetails(nullptr, userDataDirectory.c_str(),
+    HRESULT hr = CreateCoreWebView2EnvironmentWithOptions(nullptr, userDataDirectory.c_str(),
         L"", Callback<ICoreWebView2CreateCoreWebView2EnvironmentCompletedHandler>(
             [this](HRESULT result, ICoreWebView2Environment* env) -> HRESULT
     {
@@ -171,7 +171,7 @@ HRESULT BrowserWindow::InitUIWebViews()
 
     // Create WebView environment for browser UI. A separate data directory is
     // used to isolate the browser UI from web content requested by the user.
-    return CreateCoreWebView2EnvironmentWithDetails(nullptr, browserDataDirectory.c_str(),
+    return CreateCoreWebView2EnvironmentWithOptions(nullptr, browserDataDirectory.c_str(),
         L"", Callback<ICoreWebView2CreateCoreWebView2EnvironmentCompletedHandler>(
             [this](HRESULT result, ICoreWebView2Environment* env) -> HRESULT
     {
@@ -191,26 +191,26 @@ We use the [ICoreWebView2CreateCoreWebView2EnvironmentCompletedHandler](https://
 ```cpp
 HRESULT BrowserWindow::CreateBrowserControlsWebView()
 {
-    return m_uiEnv->CreateCoreWebView2Host(m_hWnd, Callback<ICoreWebView2CreateCoreWebView2HostCompletedHandler>(
-        [this](HRESULT result, ICoreWebView2Host* host) -> HRESULT
+    return m_uiEnv->CreateCoreWebView2Controller(m_hWnd, Callback<ICoreWebView2CreateCoreWebView2ControllerCompletedHandler>(
+        [this](HRESULT result, ICoreWebView2Controller* controller) -> HRESULT
     {
         if (!SUCCEEDED(result))
         {
             OutputDebugString(L"Controls WebView creation failed\n");
             return result;
         }
         // WebView created
-        m_controlsHost = host;
-        CheckFailure(m_controlsHost->get_CoreWebView2(&m_controlsWebView), L"");
+        m_controlsController = controller;
+        CheckFailure(m_controlsController->get_CoreWebView2(&m_controlsWebView), L"");
 
         wil::com_ptr<ICoreWebView2Settings> settings;
         RETURN_IF_FAILED(m_controlsWebView->get_Settings(&settings));
         RETURN_IF_FAILED(settings->put_AreDevToolsEnabled(FALSE));
 
-        RETURN_IF_FAILED(m_controlsHost->add_ZoomFactorChanged(Callback<ICoreWebView2ZoomFactorChangedEventHandler>(
-            [](ICoreWebView2Host* host, IUnknown* args) -> HRESULT
+        RETURN_IF_FAILED(m_controlsController->add_ZoomFactorChanged(Callback<ICoreWebView2ZoomFactorChangedEventHandler>(
+            [](ICoreWebView2Controller* controller, IUnknown* args) -> HRESULT
         {
-            host->put_ZoomFactor(1.0);
+            controller->put_ZoomFactor(1.0);
             return S_OK;
         }
         ).Get(), &m_controlsZoomToken));
@@ -419,8 +419,8 @@ We need to communicate the WebViews powering tabs and UI so that user interactio
 ```cpp
 HRESULT BrowserWindow::CreateBrowserControlsWebView()
 {
-    return m_uiEnv->CreateCoreWebView2Host(m_hWnd, Callback<ICoreWebView2CreateCoreWebView2HostCompletedHandler>(
-        [this](HRESULT result, ICoreWebView2Host* host) -> HRESULT
+    return m_uiEnv->CreateCoreWebView2Controller(m_hWnd, Callback<ICoreWebView2CreateCoreWebView2ControllerCompletedHandler>(
+        [this](HRESULT result, ICoreWebView2Controller* controller) -> HRESULT
     {
         // ...
 
@@ -544,15 +544,15 @@ std::unique_ptr<Tab> Tab::CreateNewTab(HWND hWnd, ICoreWebView2Environment* env,
 
 HRESULT Tab::Init(ICoreWebView2Environment* env, bool shouldBeActive)
 {
-    return env->CreateCoreWebView2Host(m_parentHWnd, Callback<ICoreWebView2CreateCoreWebView2HostCompletedHandler>(
-        [this, shouldBeActive](HRESULT result, ICoreWebView2Host* host) -> HRESULT {
+    return env->CreateCoreWebView2Controller(m_parentHWnd, Callback<ICoreWebView2CreateCoreWebView2ControllerCompletedHandler>(
+        [this, shouldBeActive](HRESULT result, ICoreWebView2Controller* controller) -> HRESULT {
         if (!SUCCEEDED(result))
         {
             OutputDebugString(L"Tab WebView creation failed\n");
             return result;
         }
-        m_contentHost = host;
-        BrowserWindow::CheckFailure(m_contentHost->get_CoreWebView2(&m_contentWebView), L"");
+        m_contentController = controller;
+        BrowserWindow::CheckFailure(m_contentController->get_CoreWebView2(&m_contentWebView), L"");
         BrowserWindow* browserWindow = reinterpret_cast<BrowserWindow*>(GetWindowLongPtr(m_parentHWnd, GWLP_USERDATA));
         RETURN_IF_FAILED(m_contentWebView->add_WebMessageReceived(m_messageBroker.Get(), &m_messageBrokerToken));
 
diff --git a/Tab.cpp b/Tab.cpp
@@ -21,15 +21,15 @@ std::unique_ptr<Tab> Tab::CreateNewTab(HWND hWnd, ICoreWebView2Environment* env,
 
 HRESULT Tab::Init(ICoreWebView2Environment* env, bool shouldBeActive)
 {
-    return env->CreateCoreWebView2Host(m_parentHWnd, Callback<ICoreWebView2CreateCoreWebView2HostCompletedHandler>(
-        [this, shouldBeActive](HRESULT result, ICoreWebView2Host* host) -> HRESULT {
+    return env->CreateCoreWebView2Controller(m_parentHWnd, Callback<ICoreWebView2CreateCoreWebView2ControllerCompletedHandler>(
+        [this, shouldBeActive](HRESULT result, ICoreWebView2Controller* host) -> HRESULT {
         if (!SUCCEEDED(result))
         {
             OutputDebugString(L"Tab WebView creation failed\n");
             return result;
         }
-        m_contentHost = host;
-        BrowserWindow::CheckFailure(m_contentHost->get_CoreWebView2(&m_contentWebView), L"");
+        m_contentController = host;
+        BrowserWindow::CheckFailure(m_contentController->get_CoreWebView2(&m_contentWebView), L"");
         BrowserWindow* browserWindow = reinterpret_cast<BrowserWindow*>(GetWindowLongPtr(m_parentHWnd, GWLP_USERDATA));
         RETURN_IF_FAILED(m_contentWebView->add_WebMessageReceived(m_messageBroker.Get(), &m_messageBrokerToken));
 
@@ -106,5 +106,5 @@ HRESULT Tab::ResizeWebView()
     BrowserWindow* browserWindow = reinterpret_cast<BrowserWindow*>(GetWindowLongPtr(m_parentHWnd, GWLP_USERDATA));
     bounds.top += browserWindow->GetDPIAwareBound(BrowserWindow::c_uiBarHeight);
 
-    return m_contentHost->put_Bounds(bounds);
+    return m_contentController->put_Bounds(bounds);
 }
diff --git a/Tab.h b/Tab.h
@@ -9,7 +9,7 @@
 class Tab
 {
 public:
-    Microsoft::WRL::ComPtr<ICoreWebView2Host> m_contentHost;
+    Microsoft::WRL::ComPtr<ICoreWebView2Controller> m_contentController;
     Microsoft::WRL::ComPtr<ICoreWebView2> m_contentWebView;
     Microsoft::WRL::ComPtr<ICoreWebView2DevToolsProtocolEventReceiver> m_securityStateChangedReceiver;
 
diff --git a/WebViewBrowserApp.vcxproj b/WebViewBrowserApp.vcxproj
diff --git a/packages.config b/packages.config

Original file line number	Diff line number	Diff line change
`@@ -236,24 +236,24 @@ HRESULT BrowserWindow::InitUIWebViews()`
`236`	`236`
`237`	`237`	`HRESULT BrowserWindow::CreateBrowserControlsWebView()`
`238`	`238`	`{`
`239`		`- return m_uiEnv->CreateCoreWebView2Host(m_hWnd, Callback<ICoreWebView2CreateCoreWebView2HostCompletedHandler>(`
`240`		`- [this](HRESULT result, ICoreWebView2Host* host) -> HRESULT`
	`239`	`+ return m_uiEnv->CreateCoreWebView2Controller(m_hWnd, Callback<ICoreWebView2CreateCoreWebView2ControllerCompletedHandler>(`
	`240`	`+ [this](HRESULT result, ICoreWebView2Controller* host) -> HRESULT`
`241`	`241`	`{`
`242`	`242`	`if (!SUCCEEDED(result))`
`243`	`243`	`{`
`244`	`244`	`OutputDebugString(L"Controls WebView creation failed\n");`
`245`	`245`	`return result;`
`246`	`246`	`}`
`247`	`247`	`// WebView created`
`248`		`- m_controlsHost = host;`
`249`		`- CheckFailure(m_controlsHost->get_CoreWebView2(&m_controlsWebView), L"");`
	`248`	`+ m_controlsController = host;`
	`249`	`+ CheckFailure(m_controlsController->get_CoreWebView2(&m_controlsWebView), L"");`
`250`	`250`
`251`	`251`	`wil::com_ptr<ICoreWebView2Settings> settings;`
`252`	`252`	`RETURN_IF_FAILED(m_controlsWebView->get_Settings(&settings));`
`253`	`253`	`RETURN_IF_FAILED(settings->put_AreDevToolsEnabled(FALSE));`
`254`	`254`
`255`		`- RETURN_IF_FAILED(m_controlsHost->add_ZoomFactorChanged(Callback<ICoreWebView2ZoomFactorChangedEventHandler>(`
`256`		`- [](ICoreWebView2Host* host, IUnknown* args) -> HRESULT`
	`255`	`+ RETURN_IF_FAILED(m_controlsController->add_ZoomFactorChanged(Callback<ICoreWebView2ZoomFactorChangedEventHandler>(`
	`256`	`+ [](ICoreWebView2Controller* host, IUnknown* args) -> HRESULT`
`257`	`257`	`{`
`258`	`258`	`host->put_ZoomFactor(1.0);`
`259`	`259`	`return S_OK;`
`@@ -272,37 +272,37 @@ HRESULT BrowserWindow::CreateBrowserControlsWebView()`
`272`	`272`
`273`	`273`	`HRESULT BrowserWindow::CreateBrowserOptionsWebView()`
`274`	`274`	`{`
`275`		`- return m_uiEnv->CreateCoreWebView2Host(m_hWnd, Callback<ICoreWebView2CreateCoreWebView2HostCompletedHandler>(`
`276`		`- [this](HRESULT result, ICoreWebView2Host* host) -> HRESULT`
	`275`	`+ return m_uiEnv->CreateCoreWebView2Controller(m_hWnd, Callback<ICoreWebView2CreateCoreWebView2ControllerCompletedHandler>(`
	`276`	`+ [this](HRESULT result, ICoreWebView2Controller* host) -> HRESULT`
`277`	`277`	`{`
`278`	`278`	`if (!SUCCEEDED(result))`
`279`	`279`	`{`
`280`	`280`	`OutputDebugString(L"Options WebView creation failed\n");`
`281`	`281`	`return result;`
`282`	`282`	`}`
`283`	`283`	`// WebView created`
`284`		`- m_optionsHost = host;`
`285`		`- CheckFailure(m_optionsHost->get_CoreWebView2(&m_optionsWebView), L"");`
	`284`	`+ m_optionsController = host;`
	`285`	`+ CheckFailure(m_optionsController->get_CoreWebView2(&m_optionsWebView), L"");`
`286`	`286`
`287`	`287`	`wil::com_ptr<ICoreWebView2Settings> settings;`
`288`	`288`	`RETURN_IF_FAILED(m_optionsWebView->get_Settings(&settings));`
`289`	`289`	`RETURN_IF_FAILED(settings->put_AreDevToolsEnabled(FALSE));`
`290`	`290`
`291`		`- RETURN_IF_FAILED(m_optionsHost->add_ZoomFactorChanged(Callback<ICoreWebView2ZoomFactorChangedEventHandler>(`
`292`		`- [](ICoreWebView2Host* host, IUnknown* args) -> HRESULT`
	`291`	`+ RETURN_IF_FAILED(m_optionsController->add_ZoomFactorChanged(Callback<ICoreWebView2ZoomFactorChangedEventHandler>(`
	`292`	`+ [](ICoreWebView2Controller* host, IUnknown* args) -> HRESULT`
`293`	`293`	`{`
`294`	`294`	`host->put_ZoomFactor(1.0);`
`295`	`295`	`return S_OK;`
`296`	`296`	`}`
`297`	`297`	`).Get(), &m_optionsZoomToken));`
`298`	`298`
`299`	`299`	`// Hide by default`
`300`		`- RETURN_IF_FAILED(m_optionsHost->put_IsVisible(FALSE));`
	`300`	`+ RETURN_IF_FAILED(m_optionsController->put_IsVisible(FALSE));`
`301`	`301`	`RETURN_IF_FAILED(m_optionsWebView->add_WebMessageReceived(m_uiMessageBroker.Get(), &m_optionsUIMessageBrokerToken));`
`302`	`302`
`303`	`303`	`// Hide menu when focus is lost`
`304`		`- RETURN_IF_FAILED(m_optionsHost->add_LostFocus(Callback<ICoreWebView2FocusChangedEventHandler>(`
`305`		`- [this](ICoreWebView2Host* sender, IUnknown* args) -> HRESULT`
	`304`	`+ RETURN_IF_FAILED(m_optionsController->add_LostFocus(Callback<ICoreWebView2FocusChangedEventHandler>(`
	`305`	`+ [this](ICoreWebView2Controller* sender, IUnknown* args) -> HRESULT`
`306`	`306`	`{`
`307`	`307`	`web::json::value jsonObj = web::json::value::parse(L"{}");`
`308`	`308`	`jsonObj[L"message"] = web::json::value(MG_OPTIONS_LOST_FOCUS);`
`@@ -363,7 +363,7 @@ void BrowserWindow::SetUIMessageBroker()`
`363`	`363`	`}`
`364`	`364`	`else`
`365`	`365`	`{`
`366`		`- m_tabs.at(id)->m_contentHost->Close();`
	`366`	`+ m_tabs.at(id)->m_contentController->Close();`
`367`	`367`	`it->second = std::move(newTab);`
`368`	`368`	`}`
`369`	`369`	`}`
`@@ -428,7 +428,7 @@ void BrowserWindow::SetUIMessageBroker()`
`428`	`428`	`case MG_CLOSE_TAB:`
`429`	`429`	`{`
`430`	`430`	`size_t id = args.at(L"tabId").as_number().to_uint32();`
`431`		`- m_tabs.at(id)->m_contentHost->Close();`
	`431`	`+ m_tabs.at(id)->m_contentController->Close();`
`432`	`432`	`m_tabs.erase(id);`
`433`	`433`	`}`
`434`	`434`	`break;`
`@@ -439,18 +439,18 @@ void BrowserWindow::SetUIMessageBroker()`
`439`	`439`	`break;`
`440`	`440`	`case MG_SHOW_OPTIONS:`
`441`	`441`	`{`
`442`		`- CheckFailure(m_optionsHost->put_IsVisible(TRUE), L"");`
`443`		`- m_optionsHost->MoveFocus(CORE_WEBVIEW2_MOVE_FOCUS_REASON_PROGRAMMATIC);`
	`442`	`+ CheckFailure(m_optionsController->put_IsVisible(TRUE), L"");`
	`443`	`+ m_optionsController->MoveFocus(COREWEBVIEW2_MOVE_FOCUS_REASON_PROGRAMMATIC);`
`444`	`444`	`}`
`445`	`445`	`break;`
`446`	`446`	`case MG_HIDE_OPTIONS:`
`447`	`447`	`{`
`448`		`- CheckFailure(m_optionsHost->put_IsVisible(FALSE), L"Something went wrong when trying to close the options dropdown.");`
	`448`	`+ CheckFailure(m_optionsController->put_IsVisible(FALSE), L"Something went wrong when trying to close the options dropdown.");`
`449`	`449`	`}`
`450`	`450`	`break;`
`451`	`451`	`case MG_OPTION_SELECTED:`
`452`	`452`	`{`
`453`		`- m_tabs.at(m_activeTabId)->m_contentHost->MoveFocus(CORE_WEBVIEW2_MOVE_FOCUS_REASON_PROGRAMMATIC);`
	`453`	`+ m_tabs.at(m_activeTabId)->m_contentController->MoveFocus(COREWEBVIEW2_MOVE_FOCUS_REASON_PROGRAMMATIC);`
`454`	`454`	`}`
`455`	`455`	`break;`
`456`	`456`	`case MG_GET_FAVORITES:`
`@@ -480,12 +480,12 @@ HRESULT BrowserWindow::SwitchToTab(size_t tabId)`
`480`	`480`	`size_t previousActiveTab = m_activeTabId;`
`481`	`481`
`482`	`482`	`RETURN_IF_FAILED(m_tabs.at(tabId)->ResizeWebView());`
`483`		`- RETURN_IF_FAILED(m_tabs.at(tabId)->m_contentHost->put_IsVisible(TRUE));`
	`483`	`+ RETURN_IF_FAILED(m_tabs.at(tabId)->m_contentController->put_IsVisible(TRUE));`
`484`	`484`	`m_activeTabId = tabId;`
`485`	`485`
`486`	`486`	`if (previousActiveTab != INVALID_TAB_ID && previousActiveTab != m_activeTabId)`
`487`	`487`	`{`
`488`		`- RETURN_IF_FAILED(m_tabs.at(previousActiveTab)->m_contentHost->put_IsVisible(FALSE));`
	`488`	`+ RETURN_IF_FAILED(m_tabs.at(previousActiveTab)->m_contentController->put_IsVisible(FALSE));`
`489`	`489`	`}`
`490`	`490`
`491`	`491`	`return S_OK;`
`@@ -824,7 +824,7 @@ HRESULT BrowserWindow::ResizeUIWebViews()`
`824`	`824`	`bounds.bottom = bounds.top + GetDPIAwareBound(c_uiBarHeight);`
`825`	`825`	`bounds.bottom += 1;`
`826`	`826`
`827`		`- RETURN_IF_FAILED(m_controlsHost->put_Bounds(bounds));`
	`827`	`+ RETURN_IF_FAILED(m_controlsController->put_Bounds(bounds));`
`828`	`828`	`}`
`829`	`829`
`830`	`830`	`if (m_optionsWebView != nullptr)`
`@@ -835,7 +835,7 @@ HRESULT BrowserWindow::ResizeUIWebViews()`
`835`	`835`	`bounds.bottom = bounds.top + GetDPIAwareBound(c_optionsDropdownHeight);`
`836`	`836`	`bounds.left = bounds.right - GetDPIAwareBound(c_optionsDropdownWidth);`
`837`	`837`
`838`		`- RETURN_IF_FAILED(m_optionsHost->put_Bounds(bounds));`
	`838`	`+ RETURN_IF_FAILED(m_optionsController->put_Bounds(bounds));`
`839`	`839`	`}`
`840`	`840`
`841`	`841`	`// Workaround for black controls WebView issue in Windows 7`
Original file line number	Diff line number	Diff line change
`@@ -21,15 +21,15 @@ std::unique_ptr<Tab> Tab::CreateNewTab(HWND hWnd, ICoreWebView2Environment* env,`
`21`	`21`
`22`	`22`	`HRESULT Tab::Init(ICoreWebView2Environment* env, bool shouldBeActive)`
`23`	`23`	`{`
`24`		`- return env->CreateCoreWebView2Host(m_parentHWnd, Callback<ICoreWebView2CreateCoreWebView2HostCompletedHandler>(`
`25`		`- [this, shouldBeActive](HRESULT result, ICoreWebView2Host* host) -> HRESULT {`
	`24`	`+ return env->CreateCoreWebView2Controller(m_parentHWnd, Callback<ICoreWebView2CreateCoreWebView2ControllerCompletedHandler>(`
	`25`	`+ [this, shouldBeActive](HRESULT result, ICoreWebView2Controller* host) -> HRESULT {`
`26`	`26`	`if (!SUCCEEDED(result))`
`27`	`27`	`{`
`28`	`28`	`OutputDebugString(L"Tab WebView creation failed\n");`
`29`	`29`	`return result;`
`30`	`30`	`}`
`31`		`- m_contentHost = host;`
`32`		`- BrowserWindow::CheckFailure(m_contentHost->get_CoreWebView2(&m_contentWebView), L"");`
	`31`	`+ m_contentController = host;`
	`32`	`+ BrowserWindow::CheckFailure(m_contentController->get_CoreWebView2(&m_contentWebView), L"");`
`33`	`33`	`BrowserWindow* browserWindow = reinterpret_cast<BrowserWindow*>(GetWindowLongPtr(m_parentHWnd, GWLP_USERDATA));`
`34`	`34`	`RETURN_IF_FAILED(m_contentWebView->add_WebMessageReceived(m_messageBroker.Get(), &m_messageBrokerToken));`
`35`	`35`
`@@ -106,5 +106,5 @@ HRESULT Tab::ResizeWebView()`
`106`	`106`	`BrowserWindow* browserWindow = reinterpret_cast<BrowserWindow*>(GetWindowLongPtr(m_parentHWnd, GWLP_USERDATA));`
`107`	`107`	`bounds.top += browserWindow->GetDPIAwareBound(BrowserWindow::c_uiBarHeight);`
`108`	`108`
`109`		`- return m_contentHost->put_Bounds(bounds);`
	`109`	`+ return m_contentController->put_Bounds(bounds);`
`110`	`110`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`class Tab`
`10`	`10`	`{`
`11`	`11`	`public:`
`12`		`- Microsoft::WRL::ComPtr<ICoreWebView2Host> m_contentHost;`
	`12`	`+ Microsoft::WRL::ComPtr<ICoreWebView2Controller> m_contentController;`
`13`	`13`	`Microsoft::WRL::ComPtr<ICoreWebView2> m_contentWebView;`
`14`	`14`	`Microsoft::WRL::ComPtr<ICoreWebView2DevToolsProtocolEventReceiver> m_securityStateChangedReceiver;`
`15`	`15`