code cleanup

This commit is contained in:
deepak1556 2017-01-31 14:55:48 +05:30
parent cbeaa6be87
commit 7a0aff2bae
7 changed files with 21 additions and 22 deletions

View file

@ -248,8 +248,8 @@ WebContents::WebContents(v8::Isolate* isolate,
content::WebContents* web_contents,
Type type)
: content::WebContentsObserver(web_contents),
zoom_controller_(nullptr),
embedder_(nullptr),
zoom_controller_(nullptr),
type_(type),
request_id_(0),
background_throttling_(true),
@ -267,8 +267,8 @@ WebContents::WebContents(v8::Isolate* isolate,
}
WebContents::WebContents(v8::Isolate* isolate, const mate::Dictionary& options)
: zoom_controller_(nullptr),
embedder_(nullptr),
: embedder_(nullptr),
zoom_controller_(nullptr),
type_(BROWSER_WINDOW),
request_id_(0),
background_throttling_(true),
@ -354,7 +354,7 @@ void WebContents::InitWithSessionAndOptions(v8::Isolate* isolate,
WebContentsZoomController::CreateForWebContents(web_contents);
zoom_controller_ = WebContentsZoomController::FromWebContents(web_contents);
double zoom_factor;
if (options.Get("zoomFactor", &zoom_factor))
if (options.Get(options::kZoomFactor, &zoom_factor))
zoom_controller_->SetDefaultZoomFactor(zoom_factor);
web_contents->SetUserAgentOverride(GetBrowserContext()->GetUserAgent());

View file

@ -8,6 +8,7 @@
#include "atom/common/native_mate_converters/content_converter.h"
#include "atom/common/native_mate_converters/value_converter.h"
#include "atom/common/node_includes.h"
#include "atom/common/options_switches.h"
#include "content/public/browser/browser_context.h"
#include "native_mate/dictionary.h"
@ -26,7 +27,7 @@ void AddGuest(int guest_instance_id,
guest_web_contents);
double zoom_factor;
if (options.GetDouble("zoomFactor", &zoom_factor)) {
if (options.GetDouble(atom::options::kZoomFactor, &zoom_factor)) {
atom::WebContentsZoomController::FromWebContents(guest_web_contents)
->SetDefaultZoomFactor(zoom_factor);
}

View file

@ -7,7 +7,6 @@
#include "content/public/browser/navigation_details.h"
#include "content/public/browser/navigation_entry.h"
#include "content/public/browser/navigation_handle.h"
#include "content/public/browser/render_frame_host.h"
#include "content/public/browser/render_process_host.h"
#include "content/public/browser/render_view_host.h"
#include "content/public/browser/web_contents.h"
@ -31,9 +30,7 @@ WebContentsZoomController::WebContentsZoomController(
&WebContentsZoomController::OnZoomLevelChanged, base::Unretained(this)));
}
WebContentsZoomController::~WebContentsZoomController() {
embedder_zoom_controller_ = nullptr;
}
WebContentsZoomController::~WebContentsZoomController() {}
void WebContentsZoomController::AddObserver(
WebContentsZoomController::Observer* observer) {
@ -72,8 +69,8 @@ void WebContentsZoomController::SetZoomLevel(double level) {
host_zoom_factor_[host] = new_zoom_factor;
content::HostZoomMap::SetZoomLevel(web_contents(), level);
// Notify observers of zoom level changes.
FOR_EACH_OBSERVER(WebContentsZoomController::Observer, observers_,
OnZoomLevelChanged(web_contents(), level, false));
for (Observer& observer : observers_)
observer.OnZoomLevelChanged(web_contents(), level, false);
}
}
@ -94,8 +91,8 @@ void WebContentsZoomController::SetTemporaryZoomLevel(double level) {
old_view_id_ = web_contents()->GetRenderViewHost()->GetRoutingID();
host_zoom_map_->SetTemporaryZoomLevel(old_process_id_, old_view_id_, level);
// Notify observers of zoom level changes.
FOR_EACH_OBSERVER(WebContentsZoomController::Observer, observers_,
OnZoomLevelChanged(web_contents(), level, true));
for (Observer& observer : observers_)
observer.OnZoomLevelChanged(web_contents(), level, true);
}
bool WebContentsZoomController::UsesTemporaryZoomLevel() {
@ -122,6 +119,7 @@ void WebContentsZoomController::DidFinishNavigation(
void WebContentsZoomController::WebContentsDestroyed() {
observers_.Clear();
host_zoom_factor_.clear();
embedder_zoom_controller_ = nullptr;
}
void WebContentsZoomController::RenderFrameHostChanged(

View file

@ -23,11 +23,11 @@ const int kDefaultHeight = 300;
} // namespace
WebViewGuestDelegate::WebViewGuestDelegate()
: guest_host_(nullptr),
: embedder_zoom_controller_(nullptr),
guest_host_(nullptr),
auto_size_enabled_(false),
is_full_page_plugin_(false),
api_web_contents_(nullptr) {
}
api_web_contents_(nullptr) {}
WebViewGuestDelegate::~WebViewGuestDelegate() {
}
@ -39,9 +39,11 @@ void WebViewGuestDelegate::Initialize(api::WebContents* api_web_contents) {
void WebViewGuestDelegate::Destroy() {
// Give the content module an opportunity to perform some cleanup.
embedder_zoom_controller_->RemoveObserver(this);
if (embedder_zoom_controller_) {
embedder_zoom_controller_->RemoveObserver(this);
embedder_zoom_controller_ = nullptr;
}
guest_host_->WillDestroy();
embedder_zoom_controller_ = nullptr;
guest_host_ = nullptr;
}