Merge pull request #539 from amaitland/cleanup/loading-navstate

amaitland · amaitland · commit 8932fd30021c · 2014-11-05T13:44:13.000+10:00
Cleanup Loading and NavState code
diff --git a/CefSharp.Core/Internals/ClientAdapter.cpp b/CefSharp.Core/Internals/ClientAdapter.cpp
@@ -62,8 +62,6 @@ namespace CefSharp
 
         void ClientAdapter::OnLoadingStateChange(CefRefPtr<CefBrowser> browser, bool isLoading, bool canGoBack, bool canGoForward)
         {
-            _browserControl->SetIsLoading(isLoading);
-
             auto canReload = !isLoading;
             _browserControl->SetNavState(canGoBack, canGoForward, canReload);
         }
@@ -163,7 +161,6 @@ namespace CefSharp
             if (frame->IsMain())
             {
                 _browserControl->SetIsLoading(true);
-                _browserControl->SetNavState(false, false, false);
             }
 
             _browserControl->OnFrameLoadStart(StringUtils::ToClr(frame->GetURL()), frame->IsMain());

Original file line number	Diff line number	Diff line change
`@@ -62,8 +62,6 @@ namespace CefSharp`
`62`	`62`
`63`	`63`	`void ClientAdapter::OnLoadingStateChange(CefRefPtr<CefBrowser> browser, bool isLoading, bool canGoBack, bool canGoForward)`
`64`	`64`	`{`
`65`		`- _browserControl->SetIsLoading(isLoading);`
`66`		`-`
`67`	`65`	`auto canReload = !isLoading;`
`68`	`66`	`_browserControl->SetNavState(canGoBack, canGoForward, canReload);`
`69`	`67`	`}`
`@@ -163,7 +161,6 @@ namespace CefSharp`
`163`	`161`	`if (frame->IsMain())`
`164`	`162`	`{`
`165`	`163`	`_browserControl->SetIsLoading(true);`
`166`		`- _browserControl->SetNavState(false, false, false);`
`167`	`164`	`}`
`168`	`165`
`169`	`166`	`_browserControl->OnFrameLoadStart(StringUtils::ToClr(frame->GetURL()), frame->IsMain());`