diff options
Diffstat (limited to 'chrome')
15 files changed, 28 insertions, 25 deletions
diff --git a/chrome/browser/resources/task_manager/OWNERS b/chrome/browser/resources/task_manager/OWNERS new file mode 100644 index 0000000..407b30d --- /dev/null +++ b/chrome/browser/resources/task_manager/OWNERS @@ -0,0 +1 @@ +yoshiki@chromium.org diff --git a/chrome/browser/task_manager/OWNERS b/chrome/browser/task_manager/OWNERS new file mode 100644 index 0000000..407b30d --- /dev/null +++ b/chrome/browser/task_manager/OWNERS @@ -0,0 +1 @@ +yoshiki@chromium.org diff --git a/chrome/browser/ui/cocoa/browser_window_cocoa.mm b/chrome/browser/ui/cocoa/browser_window_cocoa.mm index b29f296..084f376 100644 --- a/chrome/browser/ui/cocoa/browser_window_cocoa.mm +++ b/chrome/browser/ui/cocoa/browser_window_cocoa.mm @@ -35,7 +35,7 @@ #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" #include "chrome/browser/ui/page_info_bubble.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" -#include "chrome/browser/ui/webui/task_manager_dialog.h" +#include "chrome/browser/ui/webui/task_manager/task_manager_dialog.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/pref_names.h" #include "content/public/browser/notification_source.h" diff --git a/chrome/browser/ui/gtk/browser_window_gtk.cc b/chrome/browser/ui/gtk/browser_window_gtk.cc index d67ae92..68296f8 100644 --- a/chrome/browser/ui/gtk/browser_window_gtk.cc +++ b/chrome/browser/ui/gtk/browser_window_gtk.cc @@ -72,7 +72,7 @@ #include "chrome/browser/ui/omnibox/omnibox_view.h" #include "chrome/browser/ui/page_info_bubble.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" -#include "chrome/browser/ui/webui/task_manager_dialog.h" +#include "chrome/browser/ui/webui/task_manager/task_manager_dialog.h" #include "chrome/browser/web_applications/web_app.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_switches.h" diff --git a/chrome/browser/ui/panels/panel_browser_view.cc b/chrome/browser/ui/panels/panel_browser_view.cc index b3f6d43..9873a24 100644 --- a/chrome/browser/ui/panels/panel_browser_view.cc +++ b/chrome/browser/ui/panels/panel_browser_view.cc @@ -13,7 +13,7 @@ #include "chrome/browser/ui/panels/panel_manager.h" #include "chrome/browser/ui/panels/panel_strip.h" #include "chrome/browser/ui/views/frame/browser_frame.h" -#include "chrome/browser/ui/webui/task_manager_dialog.h" +#include "chrome/browser/ui/webui/task_manager/task_manager_dialog.h" #include "chrome/common/chrome_notification_types.h" #include "content/public/browser/notification_service.h" #include "grit/chromium_strings.h" diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc index 04e60bd..4b03764 100644 --- a/chrome/browser/ui/views/frame/browser_view.cc +++ b/chrome/browser/ui/views/frame/browser_view.cc @@ -66,7 +66,7 @@ #include "chrome/browser/ui/views/update_recommended_message_box.h" #include "chrome/browser/ui/views/window.h" #include "chrome/browser/ui/webui/feedback_ui.h" -#include "chrome/browser/ui/webui/task_manager_dialog.h" +#include "chrome/browser/ui/webui/task_manager/task_manager_dialog.h" #include "chrome/browser/ui/window_sizer.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_switches.h" diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc index 0b4569e..bf34899 100644 --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc @@ -23,7 +23,7 @@ #include "chrome/browser/ui/webui/extensions/extension_activity_ui.h" #include "chrome/browser/ui/webui/extensions/extensions_ui.h" #include "chrome/browser/ui/webui/feedback_ui.h" -#include "chrome/browser/ui/webui/task_manager_ui.h" +#include "chrome/browser/ui/webui/task_manager/task_manager_ui.h" #include "chrome/browser/ui/webui/flags_ui.h" #include "chrome/browser/ui/webui/flash_ui.h" #include "chrome/browser/ui/webui/generic_handler.h" diff --git a/chrome/browser/ui/webui/task_manager/OWNERS b/chrome/browser/ui/webui/task_manager/OWNERS new file mode 100644 index 0000000..407b30d --- /dev/null +++ b/chrome/browser/ui/webui/task_manager/OWNERS @@ -0,0 +1 @@ +yoshiki@chromium.org diff --git a/chrome/browser/ui/webui/task_manager_dialog.cc b/chrome/browser/ui/webui/task_manager/task_manager_dialog.cc index 6c8b274..1bbc780 100644 --- a/chrome/browser/ui/webui/task_manager_dialog.cc +++ b/chrome/browser/ui/webui/task_manager/task_manager_dialog.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/ui/webui/task_manager_dialog.h" +#include "chrome/browser/ui/webui/task_manager/task_manager_dialog.h" #include "base/bind.h" #include "base/command_line.h" diff --git a/chrome/browser/ui/webui/task_manager_dialog.h b/chrome/browser/ui/webui/task_manager/task_manager_dialog.h index e24e461..a02df59 100644 --- a/chrome/browser/ui/webui/task_manager_dialog.h +++ b/chrome/browser/ui/webui/task_manager/task_manager_dialog.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_UI_WEBUI_TASK_MANAGER_DIALOG_H_ -#define CHROME_BROWSER_UI_WEBUI_TASK_MANAGER_DIALOG_H_ +#ifndef CHROME_BROWSER_UI_WEBUI_TASK_MANAGER_TASK_MANAGER_DIALOG_H_ +#define CHROME_BROWSER_UI_WEBUI_TASK_MANAGER_TASK_MANAGER_DIALOG_H_ #pragma once class TaskManagerDialog { @@ -16,5 +16,5 @@ class TaskManagerDialog { static bool UseWebUITaskManager(); }; -#endif // CHROME_BROWSER_UI_WEBUI_TASK_MANAGER_DIALOG_H_ +#endif // CHROME_BROWSER_UI_WEBUI_TASK_MANAGER_TASK_MANAGER_DIALOG_H_ diff --git a/chrome/browser/ui/webui/task_manager_handler.cc b/chrome/browser/ui/webui/task_manager/task_manager_handler.cc index 277aa9e..efac8f5 100644 --- a/chrome/browser/ui/webui/task_manager_handler.cc +++ b/chrome/browser/ui/webui/task_manager/task_manager_handler.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/ui/webui/task_manager_handler.h" +#include "chrome/browser/ui/webui/task_manager/task_manager_handler.h" #include <algorithm> #include <functional> diff --git a/chrome/browser/ui/webui/task_manager_handler.h b/chrome/browser/ui/webui/task_manager/task_manager_handler.h index f6f5fd6..9ab0b58 100644 --- a/chrome/browser/ui/webui/task_manager_handler.h +++ b/chrome/browser/ui/webui/task_manager/task_manager_handler.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_UI_WEBUI_TASK_MANAGER_HANDLER_H_ -#define CHROME_BROWSER_UI_WEBUI_TASK_MANAGER_HANDLER_H_ +#ifndef CHROME_BROWSER_UI_WEBUI_TASK_MANAGER_TASK_MANAGER_HANDLER_H_ +#define CHROME_BROWSER_UI_WEBUI_TASK_MANAGER_TASK_MANAGER_HANDLER_H_ #pragma once #include <set> @@ -77,4 +77,4 @@ class TaskManagerHandler : public content::WebUIMessageHandler, DISALLOW_COPY_AND_ASSIGN(TaskManagerHandler); }; -#endif // CHROME_BROWSER_UI_WEBUI_TASK_MANAGER_HANDLER_H_ +#endif // CHROME_BROWSER_UI_WEBUI_TASK_MANAGER_TASK_MANAGER_HANDLER_H_ diff --git a/chrome/browser/ui/webui/task_manager_ui.cc b/chrome/browser/ui/webui/task_manager/task_manager_ui.cc index 8ddea36..e5405dd 100644 --- a/chrome/browser/ui/webui/task_manager_ui.cc +++ b/chrome/browser/ui/webui/task_manager/task_manager_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/ui/webui/task_manager_ui.h" +#include "chrome/browser/ui/webui/task_manager/task_manager_ui.h" #include "base/values.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/task_manager/task_manager.h" #include "chrome/browser/ui/webui/chrome_url_data_manager.h" #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h" -#include "chrome/browser/ui/webui/task_manager_handler.h" +#include "chrome/browser/ui/webui/task_manager/task_manager_handler.h" #include "chrome/common/url_constants.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_ui.h" diff --git a/chrome/browser/ui/webui/task_manager_ui.h b/chrome/browser/ui/webui/task_manager/task_manager_ui.h index d743f22..272704b 100644 --- a/chrome/browser/ui/webui/task_manager_ui.h +++ b/chrome/browser/ui/webui/task_manager/task_manager_ui.h @@ -1,9 +1,9 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. -#ifndef CHROME_BROWSER_UI_WEBUI_TASK_MANAGER_UI_H_ -#define CHROME_BROWSER_UI_WEBUI_TASK_MANAGER_UI_H_ +#ifndef CHROME_BROWSER_UI_WEBUI_TASK_MANAGER_TASK_MANAGER_UI_H_ +#define CHROME_BROWSER_UI_WEBUI_TASK_MANAGER_TASK_MANAGER_UI_H_ #pragma once #include "content/public/browser/web_ui_controller.h" @@ -16,4 +16,4 @@ class TaskManagerUI : public content::WebUIController { DISALLOW_COPY_AND_ASSIGN(TaskManagerUI); }; -#endif // CHROME_BROWSER_UI_WEBUI_TASK_MANAGER_UI_H_ +#endif // CHROME_BROWSER_UI_WEBUI_TASK_MANAGER_TASK_MANAGER_UI_H_ diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 3e949ba..c71bc9e 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -4277,12 +4277,12 @@ 'browser/ui/webui/sync_setup_handler.h', 'browser/ui/webui/tab_modal_confirm_dialog_webui.cc', 'browser/ui/webui/tab_modal_confirm_dialog_webui.h', - 'browser/ui/webui/task_manager_dialog.cc', - 'browser/ui/webui/task_manager_dialog.h', - 'browser/ui/webui/task_manager_handler.cc', - 'browser/ui/webui/task_manager_handler.h', - 'browser/ui/webui/task_manager_ui.cc', - 'browser/ui/webui/task_manager_ui.h', + 'browser/ui/webui/task_manager/task_manager_dialog.cc', + 'browser/ui/webui/task_manager/task_manager_dialog.h', + 'browser/ui/webui/task_manager/task_manager_handler.cc', + 'browser/ui/webui/task_manager/task_manager_handler.h', + 'browser/ui/webui/task_manager/task_manager_ui.cc', + 'browser/ui/webui/task_manager/task_manager_ui.h', 'browser/ui/webui/test_chrome_web_ui_controller_factory.cc', 'browser/ui/webui/test_chrome_web_ui_controller_factory.h', 'browser/ui/webui/theme_source.cc', |