Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / background / background_contents_service.cc

diff --git a/src/chrome/browser/background/background_contents_service.cc b/src/chrome/browser/background/background_contents_service.cc
index 27650a0..41847f1 100644 (file)
--- a/src/chrome/browser/background/background_contents_service.cc
+++ b/src/chrome/browser/background/background_contents_service.cc
@@ -32,6 +32,7 @@
 #include "chrome/browser/ui/host_desktop.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/pref_names.h"
+#include "chrome/grit/generated_resources.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/site_instance.h"
 #include "content/public/browser/web_contents.h"
@@ -46,8 +47,7 @@
 #include "extensions/common/extension_set.h"
 #include "extensions/common/manifest_handlers/background_info.h"
 #include "extensions/common/manifest_handlers/icons_handler.h"
-#include "grit/generated_resources.h"
-#include "grit/theme_resources.h"
+#include "extensions/grit/extensions_browser_resources.h"
 #include "ipc/ipc_message.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
@@ -639,7 +639,7 @@ void BackgroundContentsService::LoadBackgroundContents(
   // TODO(atwilson): Create RenderViews asynchronously to avoid increasing
   // startup latency (http://crbug.com/47236).
   contents->web_contents()->GetController().LoadURL(
-      url, content::Referrer(), content::PAGE_TRANSITION_LINK, std::string());
+      url, content::Referrer(), ui::PAGE_TRANSITION_LINK, std::string());
 }
 
 BackgroundContents* BackgroundContentsService::CreateBackgroundContents(