summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/browser/dom_ui/web_ui_factory.cc16
-rw-r--r--chrome/browser/download/download_shelf.cc4
-rw-r--r--chrome/browser/prefs/browser_prefs.cc2
-rw-r--r--chrome/browser/webui/bookmarks_ui.cc (renamed from chrome/browser/dom_ui/bookmarks_ui.cc)4
-rw-r--r--chrome/browser/webui/bookmarks_ui.h (renamed from chrome/browser/dom_ui/bookmarks_ui.h)6
-rw-r--r--chrome/browser/webui/bookmarks_ui_uitest.cc (renamed from chrome/browser/dom_ui/bookmarks_ui_uitest.cc)0
-rw-r--r--chrome/browser/webui/conflicts_ui.cc (renamed from chrome/browser/dom_ui/conflicts_ui.cc)2
-rw-r--r--chrome/browser/webui/conflicts_ui.h (renamed from chrome/browser/dom_ui/conflicts_ui.h)6
-rw-r--r--chrome/browser/webui/devtools_ui.cc (renamed from chrome/browser/dom_ui/devtools_ui.cc)2
-rw-r--r--chrome/browser/webui/devtools_ui.h (renamed from chrome/browser/dom_ui/devtools_ui.h)6
-rw-r--r--chrome/browser/webui/downloads_ui.cc (renamed from chrome/browser/dom_ui/downloads_ui.cc)2
-rw-r--r--chrome/browser/webui/downloads_ui.h (renamed from chrome/browser/dom_ui/downloads_ui.h)6
-rw-r--r--chrome/browser/webui/flags_ui.cc (renamed from chrome/browser/dom_ui/flags_ui.cc)2
-rw-r--r--chrome/browser/webui/flags_ui.h (renamed from chrome/browser/dom_ui/flags_ui.h)6
-rw-r--r--chrome/chrome_browser.gypi20
-rw-r--r--chrome/chrome_tests.gypi2
16 files changed, 43 insertions, 43 deletions
diff --git a/chrome/browser/dom_ui/web_ui_factory.cc b/chrome/browser/dom_ui/web_ui_factory.cc
index ece5c58..d69da41 100644
--- a/chrome/browser/dom_ui/web_ui_factory.cc
+++ b/chrome/browser/dom_ui/web_ui_factory.cc
@@ -6,22 +6,18 @@
#include "base/command_line.h"
#include "chrome/browser/about_flags.h"
-#include "chrome/browser/dom_ui/bookmarks_ui.h"
#include "chrome/browser/dom_ui/bug_report_ui.h"
#include "chrome/browser/dom_ui/constrained_html_ui.h"
-#include "chrome/browser/dom_ui/downloads_ui.h"
-#include "chrome/browser/dom_ui/devtools_ui.h"
#include "chrome/browser/dom_ui/gpu_internals_ui.h"
-#include "chrome/browser/dom_ui/history_ui.h"
#include "chrome/browser/dom_ui/history2_ui.h"
+#include "chrome/browser/dom_ui/history_ui.h"
#include "chrome/browser/dom_ui/html_dialog_ui.h"
-#include "chrome/browser/dom_ui/flags_ui.h"
#include "chrome/browser/dom_ui/net_internals_ui.h"
#include "chrome/browser/dom_ui/new_tab_ui.h"
+#include "chrome/browser/dom_ui/options/options_ui.h"
#include "chrome/browser/dom_ui/plugins_ui.h"
#include "chrome/browser/dom_ui/print_preview_ui.h"
#include "chrome/browser/dom_ui/remoting_ui.h"
-#include "chrome/browser/dom_ui/options/options_ui.h"
#include "chrome/browser/dom_ui/slideshow_ui.h"
#include "chrome/browser/dom_ui/sync_internals_ui.h"
#include "chrome/browser/dom_ui/textfields_ui.h"
@@ -31,6 +27,10 @@
#include "chrome/browser/printing/print_dialog_cloud.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/tab_contents/tab_contents.h"
+#include "chrome/browser/webui/bookmarks_ui.h"
+#include "chrome/browser/webui/devtools_ui.h"
+#include "chrome/browser/webui/downloads_ui.h"
+#include "chrome/browser/webui/flags_ui.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/extensions/extension_constants.h"
#include "chrome/common/url_constants.h"
@@ -41,10 +41,10 @@
#include "chrome/browser/chromeos/webui/keyboard_overlay_ui.h"
#include "chrome/browser/chromeos/webui/menu_ui.h"
#include "chrome/browser/chromeos/webui/mobile_setup_ui.h"
+#include "chrome/browser/chromeos/webui/network_menu_ui.h"
#include "chrome/browser/chromeos/webui/register_page_ui.h"
#include "chrome/browser/chromeos/webui/system_info_ui.h"
#include "chrome/browser/chromeos/webui/wrench_menu_ui.h"
-#include "chrome/browser/chromeos/webui/network_menu_ui.h"
#include "chrome/browser/dom_ui/filebrowse_ui.h"
#include "chrome/browser/dom_ui/mediaplayer_ui.h"
#endif
@@ -58,7 +58,7 @@
#endif
#if defined(OS_WIN)
-#include "chrome/browser/dom_ui/conflicts_ui.h"
+#include "chrome/browser/webui/conflicts_ui.h"
#endif
const WebUITypeID WebUIFactory::kNoWebUI = NULL;
diff --git a/chrome/browser/download/download_shelf.cc b/chrome/browser/download/download_shelf.cc
index ce000f4..be1e82a 100644
--- a/chrome/browser/download/download_shelf.cc
+++ b/chrome/browser/download/download_shelf.cc
@@ -1,16 +1,16 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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/browser/download/download_shelf.h"
#include "base/file_util.h"
-#include "chrome/browser/dom_ui/downloads_ui.h"
#include "chrome/browser/download/download_item.h"
#include "chrome/browser/download/download_item_model.h"
#include "chrome/browser/download/download_manager.h"
#include "chrome/browser/download/download_util.h"
#include "chrome/browser/metrics/user_metrics.h"
+#include "chrome/browser/webui/downloads_ui.h"
#include "chrome/common/url_constants.h"
#include "grit/generated_resources.h"
#include "ui/base/l10n/l10n_util.h"
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index ba65eb9..a4f2f26 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -13,7 +13,6 @@
#include "chrome/browser/browser_shutdown.h"
#include "chrome/browser/content_settings/host_content_settings_map.h"
#include "chrome/browser/debugger/devtools_manager.h"
-#include "chrome/browser/dom_ui/flags_ui.h"
#include "chrome/browser/dom_ui/new_tab_ui.h"
#include "chrome/browser/dom_ui/plugins_ui.h"
#include "chrome/browser/download/download_prefs.h"
@@ -53,6 +52,7 @@
#include "chrome/browser/translate/translate_prefs.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/upgrade_detector.h"
+#include "chrome/browser/webui/flags_ui.h"
#include "chrome/common/pref_names.h"
#if defined(TOOLKIT_VIEWS) // TODO(port): whittle this down as we port
diff --git a/chrome/browser/dom_ui/bookmarks_ui.cc b/chrome/browser/webui/bookmarks_ui.cc
index 828ab54..cbfb89e 100644
--- a/chrome/browser/dom_ui/bookmarks_ui.cc
+++ b/chrome/browser/webui/bookmarks_ui.cc
@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/dom_ui/bookmarks_ui.h"
+#include "chrome/browser/webui/bookmarks_ui.h"
#include "base/message_loop.h"
#include "base/ref_counted_memory.h"
#include "base/singleton.h"
#include "chrome/browser/browser_thread.h"
-#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/dom_ui/chrome_url_data_manager.h"
+#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/tab_contents/tab_contents.h"
#include "chrome/common/url_constants.h"
#include "grit/theme_resources.h"
diff --git a/chrome/browser/dom_ui/bookmarks_ui.h b/chrome/browser/webui/bookmarks_ui.h
index 10cef4a..5cf1970 100644
--- a/chrome/browser/dom_ui/bookmarks_ui.h
+++ b/chrome/browser/webui/bookmarks_ui.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_DOM_UI_BOOKMARKS_UI_H_
-#define CHROME_BROWSER_DOM_UI_BOOKMARKS_UI_H_
+#ifndef CHROME_BROWSER_WEBUI_BOOKMARKS_UI_H_
+#define CHROME_BROWSER_WEBUI_BOOKMARKS_UI_H_
#pragma once
#include <string>
@@ -42,4 +42,4 @@ class BookmarksUI : public WebUI {
DISALLOW_COPY_AND_ASSIGN(BookmarksUI);
};
-#endif // CHROME_BROWSER_DOM_UI_BOOKMARKS_UI_H_
+#endif // CHROME_BROWSER_WEBUI_BOOKMARKS_UI_H_
diff --git a/chrome/browser/dom_ui/bookmarks_ui_uitest.cc b/chrome/browser/webui/bookmarks_ui_uitest.cc
index 04c37f6..04c37f6 100644
--- a/chrome/browser/dom_ui/bookmarks_ui_uitest.cc
+++ b/chrome/browser/webui/bookmarks_ui_uitest.cc
diff --git a/chrome/browser/dom_ui/conflicts_ui.cc b/chrome/browser/webui/conflicts_ui.cc
index 455b446..1e041bb 100644
--- a/chrome/browser/dom_ui/conflicts_ui.cc
+++ b/chrome/browser/webui/conflicts_ui.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/dom_ui/conflicts_ui.h"
+#include "chrome/browser/webui/conflicts_ui.h"
#if defined(OS_WIN)
diff --git a/chrome/browser/dom_ui/conflicts_ui.h b/chrome/browser/webui/conflicts_ui.h
index 48ea0fd..ec8665a 100644
--- a/chrome/browser/dom_ui/conflicts_ui.h
+++ b/chrome/browser/webui/conflicts_ui.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_DOM_UI_CONFLICTS_UI_H_
-#define CHROME_BROWSER_DOM_UI_CONFLICTS_UI_H_
+#ifndef CHROME_BROWSER_WEBUI_CONFLICTS_UI_H_
+#define CHROME_BROWSER_WEBUI_CONFLICTS_UI_H_
#pragma once
#include "chrome/browser/dom_ui/web_ui.h"
@@ -25,4 +25,4 @@ class ConflictsUI : public WebUI {
#endif
-#endif // CHROME_BROWSER_DOM_UI_CONFLICTS_UI_H_
+#endif // CHROME_BROWSER_WEBUI_CONFLICTS_UI_H_
diff --git a/chrome/browser/dom_ui/devtools_ui.cc b/chrome/browser/webui/devtools_ui.cc
index 45b2bb3..6e767a0 100644
--- a/chrome/browser/dom_ui/devtools_ui.cc
+++ b/chrome/browser/webui/devtools_ui.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/dom_ui/devtools_ui.h"
+#include "chrome/browser/webui/devtools_ui.h"
#include "chrome/browser/renderer_host/render_view_host.h"
#include "chrome/common/render_messages.h"
diff --git a/chrome/browser/dom_ui/devtools_ui.h b/chrome/browser/webui/devtools_ui.h
index 6fb2644..ebaddf7 100644
--- a/chrome/browser/dom_ui/devtools_ui.h
+++ b/chrome/browser/webui/devtools_ui.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_DOM_UI_DEVTOOLS_UI_H_
-#define CHROME_BROWSER_DOM_UI_DEVTOOLS_UI_H_
+#ifndef CHROME_BROWSER_WEBUI_DEVTOOLS_UI_H_
+#define CHROME_BROWSER_WEBUI_DEVTOOLS_UI_H_
#pragma once
#include "chrome/browser/dom_ui/web_ui.h"
@@ -19,4 +19,4 @@ class DevToolsUI : public WebUI {
DISALLOW_COPY_AND_ASSIGN(DevToolsUI);
};
-#endif // CHROME_BROWSER_DOM_UI_DEVTOOLS_UI_H_
+#endif // CHROME_BROWSER_WEBUI_DEVTOOLS_UI_H_
diff --git a/chrome/browser/dom_ui/downloads_ui.cc b/chrome/browser/webui/downloads_ui.cc
index 4f326f4..43b91b2 100644
--- a/chrome/browser/dom_ui/downloads_ui.cc
+++ b/chrome/browser/webui/downloads_ui.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/dom_ui/downloads_ui.h"
+#include "chrome/browser/webui/downloads_ui.h"
#include "base/singleton.h"
#include "base/string_piece.h"
diff --git a/chrome/browser/dom_ui/downloads_ui.h b/chrome/browser/webui/downloads_ui.h
index c5afe95..73bd79d 100644
--- a/chrome/browser/dom_ui/downloads_ui.h
+++ b/chrome/browser/webui/downloads_ui.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_DOM_UI_DOWNLOADS_UI_H_
-#define CHROME_BROWSER_DOM_UI_DOWNLOADS_UI_H_
+#ifndef CHROME_BROWSER_WEBUI_DOWNLOADS_UI_H_
+#define CHROME_BROWSER_WEBUI_DOWNLOADS_UI_H_
#pragma once
#include "chrome/browser/dom_ui/web_ui.h"
@@ -20,4 +20,4 @@ class DownloadsUI : public WebUI {
DISALLOW_COPY_AND_ASSIGN(DownloadsUI);
};
-#endif // CHROME_BROWSER_DOM_UI_DOWNLOADS_UI_H_
+#endif // CHROME_BROWSER_WEBUI_DOWNLOADS_UI_H_
diff --git a/chrome/browser/dom_ui/flags_ui.cc b/chrome/browser/webui/flags_ui.cc
index 8b14361..325bb5d 100644
--- a/chrome/browser/dom_ui/flags_ui.cc
+++ b/chrome/browser/webui/flags_ui.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/dom_ui/flags_ui.h"
+#include "chrome/browser/webui/flags_ui.h"
#include <string>
diff --git a/chrome/browser/dom_ui/flags_ui.h b/chrome/browser/webui/flags_ui.h
index 81fe05e..53c7f3a 100644
--- a/chrome/browser/dom_ui/flags_ui.h
+++ b/chrome/browser/webui/flags_ui.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_DOM_UI_FLAGS_UI_H_
-#define CHROME_BROWSER_DOM_UI_FLAGS_UI_H_
+#ifndef CHROME_BROWSER_WEBUI_FLAGS_UI_H_
+#define CHROME_BROWSER_WEBUI_FLAGS_UI_H_
#pragma once
#include "chrome/browser/dom_ui/web_ui.h"
@@ -22,4 +22,4 @@ class FlagsUI : public WebUI {
DISALLOW_COPY_AND_ASSIGN(FlagsUI);
};
-#endif // CHROME_BROWSER_DOM_UI_FLAGS_UI_H_
+#endif // CHROME_BROWSER_WEBUI_FLAGS_UI_H_
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 8a2ad56..3103729 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -858,8 +858,6 @@
'browser/dom_operation_notification_details.h',
'browser/dom_ui/app_launcher_handler.cc',
'browser/dom_ui/app_launcher_handler.h',
- 'browser/dom_ui/bookmarks_ui.cc',
- 'browser/dom_ui/bookmarks_ui.h',
'browser/dom_ui/bug_report_ui.cc',
'browser/dom_ui/bug_report_ui.h',
'browser/dom_ui/chrome_url_data_manager_backend.cc',
@@ -868,18 +866,12 @@
'browser/dom_ui/chrome_url_data_manager.h',
'browser/dom_ui/constrained_html_ui.cc',
'browser/dom_ui/constrained_html_ui.h',
- 'browser/dom_ui/devtools_ui.cc',
- 'browser/dom_ui/devtools_ui.h',
'browser/dom_ui/downloads_dom_handler.cc',
'browser/dom_ui/downloads_dom_handler.h',
- 'browser/dom_ui/downloads_ui.cc',
- 'browser/dom_ui/downloads_ui.h',
'browser/dom_ui/filebrowse_ui.cc',
'browser/dom_ui/filebrowse_ui.h',
'browser/dom_ui/fileicon_source.cc',
'browser/dom_ui/fileicon_source.h',
- 'browser/dom_ui/flags_ui.cc',
- 'browser/dom_ui/flags_ui.h',
'browser/dom_ui/foreign_session_handler.cc',
'browser/dom_ui/foreign_session_handler.h',
'browser/dom_ui/generic_handler.cc',
@@ -3588,6 +3580,14 @@
'browser/webdata/web_database.cc',
'browser/webdata/web_database.h',
'browser/webdata/web_database_win.cc',
+ 'browser/webui/bookmarks_ui.cc',
+ 'browser/webui/bookmarks_ui.h',
+ 'browser/webui/devtools_ui.cc',
+ 'browser/webui/devtools_ui.h',
+ 'browser/webui/downloads_ui.cc',
+ 'browser/webui/downloads_ui.h',
+ 'browser/webui/flags_ui.cc',
+ 'browser/webui/flags_ui.h',
'browser/worker_host/message_port_service.cc',
'browser/worker_host/message_port_service.h',
'browser/worker_host/worker_document_set.cc',
@@ -3963,9 +3963,9 @@
},
'sources': [
# Using built-in rule in vstudio for midl.
- 'browser/dom_ui/conflicts_ui.cc',
- 'browser/dom_ui/conflicts_ui.h',
'browser/history/history_indexer.idl',
+ 'browser/webui/conflicts_ui.cc',
+ 'browser/webui/conflicts_ui.h',
],
'sources!': [
'browser/history/history_publisher_none.cc',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 718069e..2acd834 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -553,7 +553,6 @@
'app/chrome_main_uitest.cc',
'browser/appcache/appcache_ui_test.cc',
'browser/browser_encoding_uitest.cc',
- 'browser/dom_ui/bookmarks_ui_uitest.cc',
'browser/dom_ui/new_tab_ui_uitest.cc',
'browser/dom_ui/options/options_ui_uitest.cc',
'browser/dom_ui/print_preview_ui_uitest.cc',
@@ -585,6 +584,7 @@
'browser/ui/login/login_prompt_uitest.cc',
'browser/ui/tests/browser_uitest.cc',
'browser/ui/views/find_bar_host_uitest.cc',
+ 'browser/webui/bookmarks_ui_uitest.cc',
'common/logging_chrome_uitest.cc',
'renderer/external_extension_uitest.cc',
'test/automation/automation_proxy_uitest.cc',
generated by cgit v1.1 at 2025-02-01 06:55:04 +0000