mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

🎨 lint fix

Browse source
This commit is contained in:
Heilig Benedek 2017-06-08 09:57:24 +02:00
parent 0f4341da42
commit f8d3b363ea
4 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
atom/browser/ui/webui/pdf_viewer_handler.cc
View file

@ -119,7 +119,7 @@ void PdfViewerHandler::Initialize(const base::ListValue* args) {
} else { } else {
initialize_callback_id_ = callback_id->CreateDeepCopy(); initialize_callback_id_ = callback_id->CreateDeepCopy();
} }
auto zoom_controller = WebContentsZoomController::FromWebContents( auto zoom_controller = WebContentsZoomController::FromWebContents(
web_ui()->GetWebContents()); web_ui()->GetWebContents());
zoom_controller->SetZoomMode(WebContentsZoomController::ZOOM_MODE_MANUAL); zoom_controller->SetZoomMode(WebContentsZoomController::ZOOM_MODE_MANUAL);
@ -211,7 +211,7 @@ void PdfViewerHandler::Reload(const base::ListValue* args) {
void PdfViewerHandler::OnZoomLevelChanged(content::WebContents* web_contents, void PdfViewerHandler::OnZoomLevelChanged(content::WebContents* web_contents,
double level, bool is_temporary) { double level, bool is_temporary) {
if (web_ui()->GetWebContents() == web_contents) { if (web_ui()->GetWebContents() == web_contents) {
CallJavascriptFunction("cr.webUIListenerCallback", CallJavascriptFunction("cr.webUIListenerCallback",
base::StringValue("onZoomLevelChanged"), base::StringValue("onZoomLevelChanged"),
base::Value(content::ZoomLevelToZoomFactor(level))); base::Value(content::ZoomLevelToZoomFactor(level)));
} }

2
atom/browser/ui/webui/pdf_viewer_handler.h
View file

@ -43,7 +43,7 @@ class PdfViewerHandler : public content::WebUIMessageHandler,
void SetZoom(const base::ListValue* args); void SetZoom(const base::ListValue* args);
void GetStrings(const base::ListValue* args); void GetStrings(const base::ListValue* args);
void Reload(const base::ListValue* args); void Reload(const base::ListValue* args);
void OnZoomLevelChanged(content::WebContents* web_contents, double level, void OnZoomLevelChanged(content::WebContents* web_contents, double level,
bool is_temporary); bool is_temporary);
std::unique_ptr<base::Value> initialize_callback_id_; std::unique_ptr<base::Value> initialize_callback_id_;

8
atom/browser/web_contents_zoom_controller.cc
View file

@ -67,7 +67,7 @@ void WebContentsZoomController::SetZoomLevel(double level) {
content::HostZoomMap* zoom_map = content::HostZoomMap* zoom_map =
content::HostZoomMap::GetForWebContents(web_contents()); content::HostZoomMap::GetForWebContents(web_contents());
if (zoom_mode_ == ZOOM_MODE_ISOLATED || if (zoom_mode_ == ZOOM_MODE_ISOLATED ||
zoom_map->UsesTemporaryZoomLevel(render_process_id, render_view_id)) { zoom_map->UsesTemporaryZoomLevel(render_process_id, render_view_id)) {
zoom_map->SetTemporaryZoomLevel( zoom_map->SetTemporaryZoomLevel(
render_process_id, render_view_id, level); render_process_id, render_view_id, level);
@ -164,7 +164,7 @@ void WebContentsZoomController::SetZoomMode(ZoomMode new_mode) {
// When we don't call any HostZoomMap set functions, we send the event // When we don't call any HostZoomMap set functions, we send the event
// manually. // manually.
for (Observer& observer : observers_) for (Observer& observer : observers_)
observer.OnZoomLevelChanged(web_contents(), original_zoom_level, observer.OnZoomLevelChanged(web_contents(), original_zoom_level,
false); false);
} }
break; break;
@ -181,7 +181,7 @@ void WebContentsZoomController::SetZoomMode(ZoomMode new_mode) {
// When we don't call any HostZoomMap set functions, we send the event // When we don't call any HostZoomMap set functions, we send the event
// manually. // manually.
for (Observer& observer : observers_) for (Observer& observer : observers_)
observer.OnZoomLevelChanged(web_contents(), original_zoom_level, observer.OnZoomLevelChanged(web_contents(), original_zoom_level,
false); false);
} }
break; break;
@ -211,7 +211,7 @@ void WebContentsZoomController::ResetZoomModeOnNavigationIfNeeded(
double new_zoom_level = zoom_map->GetZoomLevelForHostAndScheme( double new_zoom_level = zoom_map->GetZoomLevelForHostAndScheme(
url.scheme(), net::GetHostOrSpecFromURL(url)); url.scheme(), net::GetHostOrSpecFromURL(url));
for (Observer& observer : observers_) for (Observer& observer : observers_)
observer.OnZoomLevelChanged(web_contents(), new_zoom_level, observer.OnZoomLevelChanged(web_contents(), new_zoom_level,
false); false);
zoom_map->ClearTemporaryZoomLevel(render_process_id, render_view_id); zoom_map->ClearTemporaryZoomLevel(render_process_id, render_view_id);
zoom_mode_ = ZOOM_MODE_DEFAULT; zoom_mode_ = ZOOM_MODE_DEFAULT;

4
atom/browser/web_contents_zoom_controller.h
View file

@ -28,7 +28,7 @@ class WebContentsZoomController
protected: protected:
virtual ~Observer() {} virtual ~Observer() {}
}; };
// Defines how zoom changes are handled. // Defines how zoom changes are handled.
enum ZoomMode { enum ZoomMode {
// Results in default zoom behavior, i.e. zoom changes are handled // Results in default zoom behavior, i.e. zoom changes are handled
@ -67,7 +67,7 @@ class WebContentsZoomController
// Sets the zoom mode, which defines zoom behavior (see enum ZoomMode). // Sets the zoom mode, which defines zoom behavior (see enum ZoomMode).
void SetZoomMode(ZoomMode zoom_mode); void SetZoomMode(ZoomMode zoom_mode);
void ResetZoomModeOnNavigationIfNeeded(const GURL& url); void ResetZoomModeOnNavigationIfNeeded(const GURL& url);
ZoomMode zoom_mode() const { return zoom_mode_; } ZoomMode zoom_mode() const { return zoom_mode_; }