bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Various fixes related to the C++11/14 update (see issue #3140)

Browse Source 
- Convert scoped_ptr to std::unique_ptr from <memory>
- Convert arraysize to base::size from include/base/cef_cxx17_backports.h
- Convert NULL to nullptr
- Include include/base/cef_callback.h instead of include/base/cef_bind.h
- Implicit conversion of CefRefPtr<T> or scoped_refptr<T> to T* is gone;
  use .get() instead

See the issue for additional details.
This commit is contained in:
Marshall Greenblatt
2021-06-17 16:08:01 -04:00
parent 5d438ced79
commit 17fc2b3e3b
141 changed files with 580 additions and 627 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
tests/cefclient/browser/root_window_manager.cc
View File

@@ -6,7 +6,7 @@
#include <sstream>
#include "include/base/cef_bind.h"
#include "include/base/cef_callback.h"
#include "include/base/cef_logging.h"
#include "include/wrapper/cef_helpers.h"
#include "tests/cefclient/browser/main_context.h"
@@ -196,9 +196,7 @@ bool RootWindowManager::HasRootWindowAsExtension(
CefRefPtr<CefExtension> extension) {
REQUIRE_MAIN_THREAD();
RootWindowSet::const_iterator it = root_windows_.begin();
for (; it != root_windows_.end(); ++it) {
const RootWindow* root_window = (*it);
for (auto root_window : root_windows_) {
if (!root_window->WithExtension())
continue;
@@ -220,11 +218,10 @@ scoped_refptr<RootWindow> RootWindowManager::GetWindowForBrowser(
int browser_id) const {
REQUIRE_MAIN_THREAD();
RootWindowSet::const_iterator it = root_windows_.begin();
for (; it != root_windows_.end(); ++it) {
CefRefPtr<CefBrowser> browser = (*it)->GetBrowser();
for (auto root_window : root_windows_) {
CefRefPtr<CefBrowser> browser = root_window->GetBrowser();
if (browser.get() && browser->GetIdentifier() == browser_id)
return *it;
return root_window;
}
return nullptr;
}
@@ -254,9 +251,9 @@ void RootWindowManager::CloseAllWindows(bool force) {
// in OnRootWindowDestroyed while iterating.
RootWindowSet root_windows = root_windows_;
RootWindowSet::const_iterator it = root_windows.begin();
for (; it != root_windows.end(); ++it)
(*it)->Close(force);
for (auto root_window : root_windows_) {
root_window->Close(force);
}
}
void RootWindowManager::AddExtension(CefRefPtr<CefExtension> extension) {
@@ -298,7 +295,7 @@ void RootWindowManager::OnRootWindowCreated(
if (root_windows_.size() == 1U) {
// The first non-extension root window should be considered the active
// window.
OnRootWindowActivated(root_window);
OnRootWindowActivated(root_window.get());
}
}
}
@@ -306,9 +303,7 @@ void RootWindowManager::OnRootWindowCreated(
void RootWindowManager::NotifyExtensionsChanged() {
REQUIRE_MAIN_THREAD();
RootWindowSet::const_iterator it = root_windows_.begin();
for (; it != root_windows_.end(); ++it) {
RootWindow* root_window = *it;
for (auto root_window : root_windows_) {
if (!root_window->WithExtension())
root_window->OnExtensionsChanged(extensions_);
}
@@ -335,7 +330,7 @@ CefRefPtr<CefRequestContext> RootWindowManager::GetRequestContext(
// isolated context objects.
std::stringstream ss;
ss << command_line->GetSwitchValue(switches::kCachePath).ToString()
<< file_util::kPathSep << time(NULL);
<< file_util::kPathSep << time(nullptr);
CefString(&settings.cache_path) = ss.str();
}
}
@@ -410,7 +405,7 @@ void RootWindowManager::OnRootWindowActivated(RootWindow* root_window) {
{
base::AutoLock lock_scope(active_browser_lock_);
// May be NULL at this point, in which case we'll make the association in
// May be nullptr at this point, in which case we'll make the association in
// OnBrowserCreated.
active_browser_ = active_root_window_->GetBrowser();
}