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

🔧 Linter fascism

Browse source
This commit is contained in:
Felix Rieseberg 2017-08-21 16:52:59 -07:00
parent 6191e6e787
commit f0680587fa
3 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
atom/browser/native_browser_view.cc
View file

@ -2,9 +2,10 @@
// Use of this source code is governed by the MIT license that can be // Use of this source code is governed by the MIT license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "atom/browser/native_browser_view.h" #include <vector>
#include "atom/browser/api/atom_api_web_contents.h" #include "atom/browser/api/atom_api_web_contents.h"
#include "atom/browser/native_browser_view.h"
#include "brightray/browser/inspectable_web_contents_view.h" #include "brightray/browser/inspectable_web_contents_view.h"
namespace atom { namespace atom {

7
atom/browser/native_browser_view.h
View file

@ -5,10 +5,11 @@
#ifndef ATOM_BROWSER_NATIVE_BROWSER_VIEW_H_ #ifndef ATOM_BROWSER_NATIVE_BROWSER_VIEW_H_
#define ATOM_BROWSER_NATIVE_BROWSER_VIEW_H_ #define ATOM_BROWSER_NATIVE_BROWSER_VIEW_H_
#include <vector>
#include "atom/common/draggable_region.h"
#include "base/macros.h" #include "base/macros.h"
#include "third_party/skia/include/core/SkColor.h" #include "third_party/skia/include/core/SkColor.h"
#include "atom/common/draggable_region.h"
#include <vector>
namespace brightray { namespace brightray {
class InspectableWebContentsView; class InspectableWebContentsView;
@ -42,7 +43,7 @@ class NativeBrowserView {
// Called when the window needs to update its draggable region. // Called when the window needs to update its draggable region.
virtual void UpdateDraggableRegions( virtual void UpdateDraggableRegions(
const std::vector<gfx::Rect>& system_drag_exclude_areas) {}; const std::vector<gfx::Rect>& system_drag_exclude_areas) {}
protected: protected:
explicit NativeBrowserView( explicit NativeBrowserView(

6
atom/browser/native_browser_view_mac.h
View file

@ -6,10 +6,11 @@
#define ATOM_BROWSER_NATIVE_BROWSER_VIEW_MAC_H_ #define ATOM_BROWSER_NATIVE_BROWSER_VIEW_MAC_H_
#import <Cocoa/Cocoa.h> #import <Cocoa/Cocoa.h>
#include <vector>
#include "atom/browser/native_browser_view.h"
#include "atom/common/draggable_region.h" #include "atom/common/draggable_region.h"
#include "base/mac/scoped_nsobject.h" #include "base/mac/scoped_nsobject.h"
#include "atom/browser/native_browser_view.h"
namespace atom { namespace atom {
@ -22,7 +23,8 @@ class NativeBrowserViewMac : public NativeBrowserView {
void SetAutoResizeFlags(uint8_t flags) override; void SetAutoResizeFlags(uint8_t flags) override;
void SetBounds(const gfx::Rect& bounds) override; void SetBounds(const gfx::Rect& bounds) override;
void SetBackgroundColor(SkColor color) override; void SetBackgroundColor(SkColor color) override;
void UpdateDraggableRegions(const std::vector<gfx::Rect>& system_drag_exclude_areas) override; void UpdateDraggableRegions(
const std::vector<gfx::Rect>& system_drag_exclude_areas) override;
private: private:
DISALLOW_COPY_AND_ASSIGN(NativeBrowserViewMac); DISALLOW_COPY_AND_ASSIGN(NativeBrowserViewMac);