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

Fix cpp linting

Browse source
This commit is contained in:
Samuel Attard 2016-11-29 18:57:26 +11:00 • committed by Kevin Sawicki
commit d1b3ba39bd
4 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
atom/browser/api/atom_api_window.cc
View file

@ -282,7 +282,8 @@ void Window::OnExecuteWindowsCommand(const std::string& command_name) {
Emit("app-command", command_name); Emit("app-command", command_name);
} }
void Window::OnTouchBarItemResult(const std::string& item_type, const std::vector<std::string>& args) { void Window::OnTouchBarItemResult(const std::string& item_type,
const std::vector<std::string>& args) {
Emit("-touch-bar-interaction", item_type, args); Emit("-touch-bar-interaction", item_type, args);
} }

3
atom/browser/api/atom_api_window.h
View file

@ -85,7 +85,8 @@ class Window : public mate::TrackableObject<Window>,
void OnRendererUnresponsive() override; void OnRendererUnresponsive() override;
void OnRendererResponsive() override; void OnRendererResponsive() override;
void OnExecuteWindowsCommand(const std::string& command_name) override; void OnExecuteWindowsCommand(const std::string& command_name) override;
void OnTouchBarItemResult(const std::string& item_type, const std::vector<std::string>& args) override; void OnTouchBarItemResult(const std::string& item_type,
const std::vector<std::string>& args) override;
#if defined(OS_WIN) #if defined(OS_WIN)
void OnWindowMessage(UINT message, WPARAM w_param, LPARAM l_param) override; void OnWindowMessage(UINT message, WPARAM w_param, LPARAM l_param) override;

5
atom/browser/native_window.h
View file

@ -21,9 +21,9 @@
#include "content/public/browser/web_contents_observer.h" #include "content/public/browser/web_contents_observer.h"
#include "content/public/browser/web_contents_user_data.h" #include "content/public/browser/web_contents_user_data.h"
#include "extensions/browser/app_window/size_constraints.h" #include "extensions/browser/app_window/size_constraints.h"
#include "native_mate/constructor.h"
#include "ui/gfx/image/image.h" #include "ui/gfx/image/image.h"
#include "ui/gfx/image/image_skia.h" #include "ui/gfx/image/image_skia.h"
#include "native_mate/constructor.h"
class SkRegion; class SkRegion;
@ -233,7 +233,8 @@ class NativeWindow : public base::SupportsUserData,
void NotifyWindowEnterHtmlFullScreen(); void NotifyWindowEnterHtmlFullScreen();
void NotifyWindowLeaveHtmlFullScreen(); void NotifyWindowLeaveHtmlFullScreen();
void NotifyWindowExecuteWindowsCommand(const std::string& command); void NotifyWindowExecuteWindowsCommand(const std::string& command);
void NotifyTouchBarItemInteraction(const std::string& item_type, const std::vector<std::string>& args); void NotifyTouchBarItemInteraction(const std::string& item_type,
const std::vector<std::string>& args);
#if defined(OS_WIN) #if defined(OS_WIN)
void NotifyWindowMessage(UINT message, WPARAM w_param, LPARAM l_param); void NotifyWindowMessage(UINT message, WPARAM w_param, LPARAM l_param);

4
atom/browser/native_window_observer.h
View file

@ -6,6 +6,7 @@
#define ATOM_BROWSER_NATIVE_WINDOW_OBSERVER_H_ #define ATOM_BROWSER_NATIVE_WINDOW_OBSERVER_H_
#include <string> #include <string>
#include <vector>
#include "base/strings/string16.h" #include "base/strings/string16.h"
#include "ui/base/window_open_disposition.h" #include "ui/base/window_open_disposition.h"
@ -70,7 +71,8 @@ class NativeWindowObserver {
virtual void OnWindowLeaveFullScreen() {} virtual void OnWindowLeaveFullScreen() {}
virtual void OnWindowEnterHtmlFullScreen() {} virtual void OnWindowEnterHtmlFullScreen() {}
virtual void OnWindowLeaveHtmlFullScreen() {} virtual void OnWindowLeaveHtmlFullScreen() {}
virtual void OnTouchBarItemResult(const std::string& item_type, const std::vector<std::string>& args) {} virtual void OnTouchBarItemResult(const std::string& item_type,
const std::vector<std::string>& args) {}
// Called when window message received // Called when window message received
#if defined(OS_WIN) #if defined(OS_WIN)