Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / task_manager / browser_process_resource_provider.cc

diff --git a/src/chrome/browser/task_manager/browser_process_resource_provider.cc b/src/chrome/browser/task_manager/browser_process_resource_provider.cc
index 6d898b7..a8bc2c8 100644 (file)
--- a/src/chrome/browser/task_manager/browser_process_resource_provider.cc
+++ b/src/chrome/browser/task_manager/browser_process_resource_provider.cc
@@ -9,7 +9,7 @@
 #include "chrome/browser/task_manager/resource_provider.h"
 #include "chrome/browser/task_manager/task_manager.h"
 #include "chrome/common/chrome_switches.h"
-#include "grit/generated_resources.h"
+#include "chrome/grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "net/proxy/proxy_resolver_v8.h"
 #include "third_party/sqlite/sqlite3.h"
@@ -43,18 +43,11 @@ BrowserProcessResource::BrowserProcessResource()
       default_icon_ = new gfx::ImageSkia(gfx::ImageSkiaRep(*bitmap, 1.0f));
     }
   }
-#elif defined(OS_POSIX) && !defined(OS_MACOSX)
+#elif defined(OS_POSIX)
   if (!default_icon_) {
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
     default_icon_ = rb.GetImageSkiaNamed(IDR_PRODUCT_LOGO_16);
   }
-#elif defined(OS_MACOSX)
-  if (!default_icon_) {
-    // IDR_PRODUCT_LOGO_16 doesn't quite look like chrome/mac's icns icon. Load
-    // the real app icon (requires a nsimage->image_skia->nsimage
-    // conversion :-().
-    default_icon_ = new gfx::ImageSkia(gfx::ApplicationIconAtSize(16));
-  }
 #else
   // TODO(port): Port icon code.
   NOTIMPLEMENTED();
@@ -67,15 +60,15 @@ BrowserProcessResource::~BrowserProcessResource() {
 }
 
 // Resource methods:
-string16 BrowserProcessResource::GetTitle() const {
+base::string16 BrowserProcessResource::GetTitle() const {
   if (title_.empty()) {
     title_ = l10n_util::GetStringUTF16(IDS_TASK_MANAGER_WEB_BROWSER_CELL_TEXT);
   }
   return title_;
 }
 
-string16 BrowserProcessResource::GetProfileName() const {
-  return string16();
+base::string16 BrowserProcessResource::GetProfileName() const {
+  return base::string16();
 }
 
 gfx::ImageSkia BrowserProcessResource::GetIcon() const {
@@ -143,9 +136,9 @@ BrowserProcessResourceProvider::~BrowserProcessResourceProvider() {
 
 Resource* BrowserProcessResourceProvider::GetResource(
     int origin_pid,
-    int render_process_host_id,
-    int routing_id) {
-  if (origin_pid || render_process_host_id != -1) {
+    int child_id,
+    int route_id) {
+  if (origin_pid || child_id != -1) {
     return NULL;
   }