Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / webui / conflicts_ui.cc

diff --git a/src/chrome/browser/ui/webui/conflicts_ui.cc b/src/chrome/browser/ui/webui/conflicts_ui.cc
index 2f5572f..24f5ea1 100644 (file)
--- a/src/chrome/browser/ui/webui/conflicts_ui.cc
+++ b/src/chrome/browser/ui/webui/conflicts_ui.cc
@@ -18,6 +18,8 @@
 #include "chrome/browser/enumerate_modules_model_win.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/url_constants.h"
+#include "chrome/grit/chromium_strings.h"
+#include "chrome/grit/generated_resources.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_service.h"
@@ -27,8 +29,7 @@
 #include "content/public/browser/web_ui_data_source.h"
 #include "content/public/browser/web_ui_message_handler.h"
 #include "grit/browser_resources.h"
-#include "grit/chromium_strings.h"
-#include "grit/generated_resources.h"
+#include "grit/components_strings.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/layout.h"