summaryrefslogtreecommitdiffstats
path: root/chrome/browser/dom_ui
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/dom_ui')
-rw-r--r--chrome/browser/dom_ui/debugger_ui.cc2
-rw-r--r--chrome/browser/dom_ui/dom_ui_favicon_source.cc3
-rw-r--r--chrome/browser/dom_ui/dom_ui_thumbnail_source.cc3
-rw-r--r--chrome/browser/dom_ui/fileicon_source.h2
-rw-r--r--chrome/browser/dom_ui/history_ui.cc2
-rw-r--r--chrome/browser/dom_ui/new_tab_ui.cc2
6 files changed, 6 insertions, 8 deletions
diff --git a/chrome/browser/dom_ui/debugger_ui.cc b/chrome/browser/dom_ui/debugger_ui.cc
index c20286a..7467571 100644
--- a/chrome/browser/dom_ui/debugger_ui.cc
+++ b/chrome/browser/dom_ui/debugger_ui.cc
@@ -4,6 +4,7 @@
#include "chrome/browser/dom_ui/debugger_ui.h"
+#include "app/resource_bundle.h"
#include "base/command_line.h"
#include "base/file_util.h"
#include "base/string_util.h"
@@ -13,7 +14,6 @@
#include "chrome/browser/debugger/debugger_wrapper.h"
#include "chrome/browser/dom_ui/chrome_url_data_manager.h"
#include "chrome/common/chrome_switches.h"
-#include "chrome/common/resource_bundle.h"
#include "chrome/common/url_constants.h"
#include "net/base/mime_util.h"
diff --git a/chrome/browser/dom_ui/dom_ui_favicon_source.cc b/chrome/browser/dom_ui/dom_ui_favicon_source.cc
index d9ba79e..233bd83 100644
--- a/chrome/browser/dom_ui/dom_ui_favicon_source.cc
+++ b/chrome/browser/dom_ui/dom_ui_favicon_source.cc
@@ -4,8 +4,8 @@
#include "chrome/browser/dom_ui/dom_ui_favicon_source.h"
+#include "app/resource_bundle.h"
#include "chrome/browser/profile.h"
-#include "chrome/common/resource_bundle.h"
#include "chrome/common/url_constants.h"
#include "grit/theme_resources.h"
@@ -60,4 +60,3 @@ void DOMUIFavIconSource::OnFavIconDataAvailable(
SendResponse(request_id, default_favicon_);
}
}
-
diff --git a/chrome/browser/dom_ui/dom_ui_thumbnail_source.cc b/chrome/browser/dom_ui/dom_ui_thumbnail_source.cc
index 45b4bf3..df9c675 100644
--- a/chrome/browser/dom_ui/dom_ui_thumbnail_source.cc
+++ b/chrome/browser/dom_ui/dom_ui_thumbnail_source.cc
@@ -4,8 +4,8 @@
#include "chrome/browser/dom_ui/dom_ui_thumbnail_source.h"
+#include "app/resource_bundle.h"
#include "chrome/browser/profile.h"
-#include "chrome/common/resource_bundle.h"
#include "chrome/common/url_constants.h"
#include "googleurl/src/gurl.h"
#include "grit/theme_resources.h"
@@ -50,4 +50,3 @@ void DOMUIThumbnailSource::OnThumbnailDataAvailable(
SendResponse(request_id, default_thumbnail_);
}
}
-
diff --git a/chrome/browser/dom_ui/fileicon_source.h b/chrome/browser/dom_ui/fileicon_source.h
index 4da8c41..423efcb 100644
--- a/chrome/browser/dom_ui/fileicon_source.h
+++ b/chrome/browser/dom_ui/fileicon_source.h
@@ -5,8 +5,8 @@
#ifndef CHROME_BROWSER_DOM_UI_FILEICON_SOURCE_H_
#define CHROME_BROWSER_DOM_UI_FILEICON_SOURCE_H_
+#include "app/resource_bundle.h"
#include "chrome/browser/dom_ui/chrome_url_data_manager.h"
-#include "chrome/common/resource_bundle.h"
#if defined(OS_WIN)
#include "chrome/browser/icon_manager.h"
diff --git a/chrome/browser/dom_ui/history_ui.cc b/chrome/browser/dom_ui/history_ui.cc
index 25f84ba..ee7b3b9 100644
--- a/chrome/browser/dom_ui/history_ui.cc
+++ b/chrome/browser/dom_ui/history_ui.cc
@@ -4,6 +4,7 @@
#include "chrome/browser/dom_ui/history_ui.h"
+#include "app/resource_bundle.h"
#include "base/message_loop.h"
#include "base/string_piece.h"
#include "base/string_util.h"
@@ -19,7 +20,6 @@
#include "chrome/common/jstemplate_builder.h"
#include "chrome/common/l10n_util.h"
#include "chrome/common/notification_service.h"
-#include "chrome/common/resource_bundle.h"
#include "chrome/common/time_format.h"
#include "chrome/common/url_constants.h"
#include "net/base/escape.h"
diff --git a/chrome/browser/dom_ui/new_tab_ui.cc b/chrome/browser/dom_ui/new_tab_ui.cc
index a187560..03091d3 100644
--- a/chrome/browser/dom_ui/new_tab_ui.cc
+++ b/chrome/browser/dom_ui/new_tab_ui.cc
@@ -6,6 +6,7 @@
#include "chrome/browser/dom_ui/new_tab_ui.h"
+#include "app/resource_bundle.h"
#include "base/histogram.h"
#include "base/string_piece.h"
#include "chrome/browser/bookmarks/bookmark_model.h"
@@ -31,7 +32,6 @@
#include "chrome/common/notification_service.h"
#include "chrome/common/pref_names.h"
#include "chrome/common/pref_service.h"
-#include "chrome/common/resource_bundle.h"
#include "chrome/common/url_constants.h"
#ifdef CHROME_PERSONALIZATION
#include "chrome/personalization/personalization.h"