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

Add GetTitle for window API.

Browse source
This commit is contained in:
Cheng Zhao 2013-04-18 14:30:05 +08:00
parent df50cc08d6
commit 257e439efb
5 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
browser/api/atom_api_window.cc
View file

@ -257,6 +257,15 @@ v8::Handle<v8::Value> Window::SetTitle(const v8::Arguments &args) {
return v8::Undefined(); return v8::Undefined();
} }
// static
v8::Handle<v8::Value> Window::GetTitle(const v8::Arguments &args) {
Window *self = ObjectWrap::Unwrap<Window>(args.This());
std::string title = self->window_->GetTitle();
return v8::String::New(title.c_str(), title.size());
}
// static // static
v8::Handle<v8::Value> Window::FlashFrame(const v8::Arguments &args) { v8::Handle<v8::Value> Window::FlashFrame(const v8::Arguments &args) {
Window *self = ObjectWrap::Unwrap<Window>(args.This()); Window *self = ObjectWrap::Unwrap<Window>(args.This());
@ -331,6 +340,7 @@ void Window::Initialize(v8::Handle<v8::Object> target) {
NODE_SET_PROTOTYPE_METHOD(t, "setPosition" , SetPosition); NODE_SET_PROTOTYPE_METHOD(t, "setPosition" , SetPosition);
NODE_SET_PROTOTYPE_METHOD(t, "getPosition" , GetPosition); NODE_SET_PROTOTYPE_METHOD(t, "getPosition" , GetPosition);
NODE_SET_PROTOTYPE_METHOD(t, "setTitle" , SetTitle); NODE_SET_PROTOTYPE_METHOD(t, "setTitle" , SetTitle);
NODE_SET_PROTOTYPE_METHOD(t, "getTitle" , GetTitle);
NODE_SET_PROTOTYPE_METHOD(t, "flashFrame" , FlashFrame); NODE_SET_PROTOTYPE_METHOD(t, "flashFrame" , FlashFrame);
NODE_SET_PROTOTYPE_METHOD(t, "setKiosk" , SetKiosk); NODE_SET_PROTOTYPE_METHOD(t, "setKiosk" , SetKiosk);
NODE_SET_PROTOTYPE_METHOD(t, "isKiosk" , IsKiosk); NODE_SET_PROTOTYPE_METHOD(t, "isKiosk" , IsKiosk);

1
browser/api/atom_api_window.h
View file

@ -53,6 +53,7 @@ class Window : public EventEmitter {
static v8::Handle<v8::Value> SetPosition(const v8::Arguments &args); static v8::Handle<v8::Value> SetPosition(const v8::Arguments &args);
static v8::Handle<v8::Value> GetPosition(const v8::Arguments &args); static v8::Handle<v8::Value> GetPosition(const v8::Arguments &args);
static v8::Handle<v8::Value> SetTitle(const v8::Arguments &args); static v8::Handle<v8::Value> SetTitle(const v8::Arguments &args);
static v8::Handle<v8::Value> GetTitle(const v8::Arguments &args);
static v8::Handle<v8::Value> FlashFrame(const v8::Arguments &args); static v8::Handle<v8::Value> FlashFrame(const v8::Arguments &args);
static v8::Handle<v8::Value> SetKiosk(const v8::Arguments &args); static v8::Handle<v8::Value> SetKiosk(const v8::Arguments &args);
static v8::Handle<v8::Value> IsKiosk(const v8::Arguments &args); static v8::Handle<v8::Value> IsKiosk(const v8::Arguments &args);

1
browser/native_window.h
View file

@ -63,6 +63,7 @@ class NativeWindow : public content::WebContentsDelegate {
virtual void SetPosition(const gfx::Point& position) = 0; virtual void SetPosition(const gfx::Point& position) = 0;
virtual gfx::Point GetPosition() = 0; virtual gfx::Point GetPosition() = 0;
virtual void SetTitle(const std::string& title) = 0; virtual void SetTitle(const std::string& title) = 0;
virtual std::string GetTitle() = 0;
virtual void FlashFrame(bool flash) = 0; virtual void FlashFrame(bool flash) = 0;
virtual void SetKiosk(bool kiosk) = 0; virtual void SetKiosk(bool kiosk) = 0;
virtual bool IsKiosk() = 0; virtual bool IsKiosk() = 0;

1
browser/native_window_mac.h
View file

@ -40,6 +40,7 @@ class NativeWindowMac : public NativeWindow {
virtual void SetPosition(const gfx::Point& position) OVERRIDE; virtual void SetPosition(const gfx::Point& position) OVERRIDE;
virtual gfx::Point GetPosition() OVERRIDE; virtual gfx::Point GetPosition() OVERRIDE;
virtual void SetTitle(const std::string& title) OVERRIDE; virtual void SetTitle(const std::string& title) OVERRIDE;
virtual std::string GetTitle() OVERRIDE;
virtual void FlashFrame(bool flash) OVERRIDE; virtual void FlashFrame(bool flash) OVERRIDE;
virtual void SetKiosk(bool kiosk) OVERRIDE; virtual void SetKiosk(bool kiosk) OVERRIDE;
virtual bool IsKiosk() OVERRIDE; virtual bool IsKiosk() OVERRIDE;

4
browser/native_window_mac.mm
View file

@ -265,6 +265,10 @@ void NativeWindowMac::SetTitle(const std::string& title) {
[window() setTitle:base::SysUTF8ToNSString(title)]; [window() setTitle:base::SysUTF8ToNSString(title)];
} }
std::string NativeWindowMac::GetTitle() {
return base::SysNSStringToUTF8([window() title]);
}
void NativeWindowMac::FlashFrame(bool flash) { void NativeWindowMac::FlashFrame(bool flash) {
if (flash) { if (flash) {
attention_request_id_ = [NSApp requestUserAttention:NSInformationalRequest]; attention_request_id_ = [NSApp requestUserAttention:NSInformationalRequest];