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

Turn api::Window into a WebContentsObserver

Browse source
This commit is contained in:
Cheng Zhao 2018-02-22 14:52:04 +09:00
commit 0d9a157914
4 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
atom/browser/api/atom_api_browser_window.h
View file

@ -15,6 +15,7 @@
#include "atom/browser/native_window_observer.h"
#include "atom/common/api/atom_api_native_image.h"
#include "atom/common/key_weak_map.h"
#include "content/public/browser/web_contents_observer.h"
#include "native_mate/handle.h"
#include "native_mate/persistent_dictionary.h"
#include "ui/gfx/image/image.h"
@ -36,9 +37,8 @@ class NativeWindow;
namespace api {
class WebContents;
class BrowserWindow : public mate::TrackableObject<BrowserWindow>,
public content::WebContentsObserver,
public NativeWindowObserver {
public:
static mate::WrappableBase* New(mate::Arguments* args);
@ -87,8 +87,8 @@ class BrowserWindow : public mate::TrackableObject<BrowserWindow>,
void OnWindowLeaveFullScreen() override;
void OnWindowEnterHtmlFullScreen() override;
void OnWindowLeaveHtmlFullScreen() override;
void OnRendererUnresponsive() override;
void OnRendererResponsive() override;
void OnWindowUnresponsive() override;
void OnWindowResponsive() override;
void OnExecuteWindowsCommand(const std::string& command_name) override;
void OnTouchBarItemResult(const std::string& item_id,
const base::DictionaryValue& details) override;