diff --git a/atom/browser/api/atom_api_app.cc b/atom/browser/api/atom_api_app.cc index 9424853970..858e6ef197 100644 --- a/atom/browser/api/atom_api_app.cc +++ b/atom/browser/api/atom_api_app.cc @@ -134,6 +134,13 @@ void App::ResolveProxy(const GURL& url, ResolveProxyCallback callback) { new ResolveProxyHelper(url, callback); } +void App::SetDesktopName(const std::string& desktop_name) { +#if defined(OS_LINUX) + scoped_ptr env(base::Environment::Create()); + env->SetVar("CHROME_DESKTOP", desktop_name); +#endif +} + mate::ObjectTemplateBuilder App::GetObjectTemplateBuilder( v8::Isolate* isolate) { Browser* browser = Browser::Get(); @@ -151,7 +158,8 @@ mate::ObjectTemplateBuilder App::GetObjectTemplateBuilder( .SetMethod("setName", base::Bind(&Browser::SetName, base::Unretained(browser))) .SetMethod("getDataPath", &App::GetDataPath) - .SetMethod("resolveProxy", &App::ResolveProxy); + .SetMethod("resolveProxy", &App::ResolveProxy) + .SetMethod("setDesktopName", &App::SetDesktopName); } // static diff --git a/atom/browser/api/atom_api_app.h b/atom/browser/api/atom_api_app.h index 91aa16b820..0fcbf2c0a9 100644 --- a/atom/browser/api/atom_api_app.h +++ b/atom/browser/api/atom_api_app.h @@ -50,6 +50,7 @@ class App : public mate::EventEmitter, private: base::FilePath GetDataPath(); void ResolveProxy(const GURL& url, ResolveProxyCallback callback); + void SetDesktopName(const std::string& desktop_name); DISALLOW_COPY_AND_ASSIGN(App); }; diff --git a/atom/browser/lib/init.coffee b/atom/browser/lib/init.coffee index be752382b8..00b3626eee 100644 --- a/atom/browser/lib/init.coffee +++ b/atom/browser/lib/init.coffee @@ -77,6 +77,12 @@ setImmediate -> else if packageJson.name? app.setName packageJson.name + # Set application's desktop name. + if packageJson.desktopName? + app.setDesktopName packageJson.desktopName + else + app.setDesktopName 'atom-shell.desktop' + # Load the chrome extension support. require './chrome-extension.js' diff --git a/atom/browser/native_window_views.cc b/atom/browser/native_window_views.cc index 0bc77b35b1..08c23cc3d1 100644 --- a/atom/browser/native_window_views.cc +++ b/atom/browser/native_window_views.cc @@ -501,6 +501,10 @@ void NativeWindowViews::SetProgressBar(double progress) { static_cast(progress * 100), progress); } +#elif defined(USE_X11) + if (unity::IsRunning()) { + unity::SetProgressFraction(progress); + } #endif }