Set default window icon and set icon for nw.exe. Fix nwjs#221.

zcbenz · zcbenz · commit eef671b1054b · 2012-11-28T14:06:55.000+08:00
diff --git a/src/browser/native_window.cc b/src/browser/native_window.cc
@@ -24,6 +24,8 @@
 #include "content/nw/src/common/shell_switches.h"
 #include "content/nw/src/nw_package.h"
 #include "content/nw/src/nw_shell.h"
+#include "grit/nw_resources.h"
+#include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/rect.h"
 
 #if defined(OS_MACOSX)
@@ -67,7 +69,7 @@ NativeWindow::NativeWindow(content::Shell* shell,
       has_frame_(true) {
   manifest->GetBoolean(switches::kmFrame, &has_frame_);
 
-  LoadAppIconFromPackage();
+  LoadAppIconFromPackage(manifest);
 }
 
 NativeWindow::~NativeWindow() {
@@ -132,12 +134,17 @@ void NativeWindow::InitFromManifest(base::DictionaryValue* manifest) {
     Show();
 }
 
-void NativeWindow::LoadAppIconFromPackage() {
-  nw::Package* package = shell_->GetPackage();
+void NativeWindow::LoadAppIconFromPackage(base::DictionaryValue* manifest) {
   std::string path_string;
-  if (package->window()->GetString(switches::kmIcon, &path_string))
-    package->GetImage(FilePath::FromUTF8Unsafe(path_string),
-                      &app_icon_);
+  if (manifest->GetString(switches::kmIcon, &path_string)) {
+    // Read icon from "icon" field.
+    shell_->GetPackage()->GetImage(FilePath::FromUTF8Unsafe(path_string),
+         &app_icon_);
+  } else {
+    // Set default icon.
+    app_icon_ = ui::ResourceBundle::GetSharedInstance().
+        GetNativeImageNamed(IDR_NW_DEFAULT_ICON);
+  }
 }
 
 }  // namespace nw
diff --git a/src/browser/native_window.h b/src/browser/native_window.h
@@ -120,7 +120,7 @@ class NativeWindow {
   gfx::Image app_icon_;
 
  private:
-  void LoadAppIconFromPackage();
+  void LoadAppIconFromPackage(base::DictionaryValue* manifest);
 
   DISALLOW_COPY_AND_ASSIGN(NativeWindow);
 };
diff --git a/src/resources/default_100_percent/nw.png b/src/resources/default_100_percent/nw.png
diff --git a/src/resources/nw.ico b/src/resources/nw.ico
diff --git a/src/resources/nw_resources.grd b/src/resources/nw_resources.grd
@@ -11,6 +11,7 @@
   <translations />
   <release seq="1">
     <structures fallback_to_low_resolution="true">
+      <structure type="chrome_scaled_image" name="IDR_NW_DEFAULT_ICON" file="nw.png" />
       <structure type="chrome_scaled_image" name="IDR_NW_BACK" file="browser_back_normal.png" />
       <structure type="chrome_scaled_image" name="IDR_NW_BACK_D" file="browser_back_disabled.png" />
       <structure type="chrome_scaled_image" name="IDR_NW_BACK_H" file="browser_back_hover.png" />
diff --git a/src/shell.rc b/src/shell.rc
@@ -124,3 +124,11 @@ END
 
 /////////////////////////////////////////////////////////////////////////////
 #endif    // not APSTUDIO_INVOKED
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+IDR_MAINFRAME           ICON                    "resources\\nw.ico"
+/////////////////////////////////////////////////////////////////////////////
