Wire up resource bundles on the mac:...

chrome/common/resource_bundle_mac.mm

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/common/resource_bundle.h"
 
-#include <gtk/gtk.h>
+#include <Foundation/Foundation.h>

[Mark Mentovai, 2009/02/26 04:08:42]

#import Cocoa headers.

[TVL, 2009/02/26 12:25:34]

done (we don't want the min needed headers?)

 
 #include "base/base_paths.h"
 #include "base/data_pack.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/string_piece.h"
 #include "base/string_util.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/gfx/chrome_font.h"
 #include "chrome/common/l10n_util.h"
 
 ResourceBundle::~ResourceBundle() {
   FreeImages();
 
   delete locale_resources_data_;
   locale_resources_data_ = NULL;
   delete theme_data_;
   theme_data_ = NULL;
   delete resources_data_;
   resources_data_ = NULL;
 }
 
-void ResourceBundle::LoadResources(const std::wstring& pref_locale) {
-  FilePath resources_data_path;
-  PathService::Get(base::DIR_EXE, &resources_data_path);
-  resources_data_path = resources_data_path.Append(
-      FILE_PATH_LITERAL("chrome.pak"));
-  DCHECK(resources_data_ == NULL) << "resource data already loaded!";
-  resources_data_ = new base::DataPack;
-  bool success = resources_data_->Load(resources_data_path);
-  DCHECK(success) << "failed to load chrome.pak";
-
-  FilePath locale_path;
-  PathService::Get(chrome::DIR_LOCALES, &locale_path);
-  // TODO(tc): Handle other locales properly.
-  NOTIMPLEMENTED() << " loading en-US strings only";
-  locale_path = locale_path.Append(FILE_PATH_LITERAL("en-US.pak"));
-  DCHECK(locale_resources_data_ == NULL) << "locale data already loaded!";
-  locale_resources_data_ = new base::DataPack;
-  success = locale_resources_data_->Load(locale_path);
-  DCHECK(success) << "failed to load locale pak file";
+namespace {
+  base::DataPack* LoadResourceDataPack(NSString *name) {

[Mark Mentovai, 2009/02/26 04:08:42]

There's no extra level of indentation in an namespace.

[TVL, 2009/02/26 12:25:34]

Done.

+    base::DataPack *resource_pack = NULL;

[Mark Mentovai, 2009/02/26 04:08:42]

A pet peeve of mine is code that can't decide whether it wants to do type* v or
type *v.  You've flipped styles between the function declaration and the
variables.

[TVL, 2009/02/26 12:25:34]

Done.

+    
+    NSString *resource_path = [[NSBundle mainBundle] pathForResource:name
+                                                              ofType:@"pak"];
+    if (resource_path) {
+      FilePath resources_pak_path([resource_path fileSystemRepresentation]);
+      resource_pack = new base::DataPack;
+      bool success = resource_pack->Load(resources_pak_path);
+      DCHECK(success) << "failed to load chrome.pak";
+      if (!success) {
+        delete resource_pack;
+        resource_pack = NULL;
+      }
+    }
+    
+    return resource_pack;
+  }
 }

[Mark Mentovai, 2009/02/26 04:08:42]

At the end of the namespace:

}  // namespace

[TVL, 2009/02/26 12:25:34]

Done.

 
-FilePath ResourceBundle::GetLocaleFilePath(const std::wstring& pref_locale) {
-  FilePath locale_path;
-  PathService::Get(chrome::DIR_LOCALES, &locale_path);
+void ResourceBundle::LoadResources(const std::wstring& pref_locale) {
+  DCHECK(pref_locale.size() == 0)
+      << "ignoring resource langage for cocoa's choice";

[Mark Mentovai, 2009/02/26 04:08:42]

I have no idea what this message means or why it has anything to do with
pref_locale.size().  Care to expound?

[TVL, 2009/02/26 12:25:34]

Done.

+  
+  DCHECK(resources_data_ == NULL) << "resource data already loaded!";
+  resources_data_ = LoadResourceDataPack(@"chrome");
+  DCHECK(resources_data_) << "failed to load chrome.pak";
 
-  const std::wstring app_locale = l10n_util::GetApplicationLocale(pref_locale);
-  if (app_locale.empty())
-    return FilePath();
-
-  return locale_path.Append(WideToASCII(app_locale + L".pak"));
+  DCHECK(locale_resources_data_ == NULL) << "locale data already loaded!";
+  locale_resources_data_ = LoadResourceDataPack(@"locale");
+  DCHECK(locale_resources_data_) << "failed to load locale.pak";
 }
 
 void ResourceBundle::LoadThemeResources() {
-  FilePath theme_data_path;
-  PathService::Get(chrome::DIR_THEMES, &theme_data_path);
-  theme_data_path = theme_data_path.Append(FILE_PATH_LITERAL("default.pak"));
-  theme_data_ = new base::DataPack;
-  bool success = theme_data_->Load(theme_data_path);
-  DCHECK(success) << "failed to load theme data";
+  DCHECK(theme_data_ == NULL) << "theme data already loaded!";
+  theme_data_ = LoadResourceDataPack(@"theme");
+  DCHECK(theme_data_) << "failed to load theme.pak";
 }
 
 /* static */
 bool ResourceBundle::LoadResourceBytes(DataHandle module, int resource_id,
                                        std::vector<unsigned char>* bytes) {
   DCHECK(module);
   StringPiece data;
   if (!module->Get(resource_id, &data))
     return false;
 
@@ skipping 28 matching lines @@
       NOTREACHED() << "unable to find resource: " << message_id;
       return std::wstring();
     }
   }
 
   // Data pack encodes strings as UTF16.
   string16 msg(reinterpret_cast<const char16*>(data.data()),
                data.length() / 2);
   return UTF16ToWide(msg);
 }
-
-GdkPixbuf* ResourceBundle::LoadPixbuf(int resource_id) {
-  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-  std::vector<unsigned char> data;
-  rb.LoadImageResourceBytes(resource_id, &data);
-
-  GdkPixbufLoader* loader = gdk_pixbuf_loader_new();
-  bool ok = gdk_pixbuf_loader_write(loader, static_cast<guint8*>(data.data()),
-      data.size(), NULL);
-  DCHECK(ok) << "failed to write " << resource_id;
-  // Calling gdk_pixbuf_loader_close forces the data to be parsed by the
-  // loader.  We must do this before calling gdk_pixbuf_loader_get_pixbuf.
-  ok = gdk_pixbuf_loader_close(loader, NULL);
-  DCHECK(ok) << "close failed " << resource_id;
-  GdkPixbuf* pixbuf = gdk_pixbuf_loader_get_pixbuf(loader);
-  DCHECK(pixbuf) << "failed to load " << resource_id << " " << data.size();
-
-  // The pixbuf is owned by the loader, so add a ref so when we delete the
-  // loader, the pixbuf still exists.
-  g_object_ref(pixbuf);
-  g_object_unref(loader);
-
-  return pixbuf;
-}