summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-03 12:22:37 +0000
committerpfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-03 12:22:37 +0000
commit1503abc34da996ed7fba826cb9a620299dc0bff1 (patch)
tree9a21ca12b108e0d0d6d37bb585014dbb9c7a4d90
parent31b488cb0b502b551f28cc0a7038b996faa49739 (diff)
downloadchromium_src-1503abc34da996ed7fba826cb9a620299dc0bff1.zip
chromium_src-1503abc34da996ed7fba826cb9a620299dc0bff1.tar.gz
chromium_src-1503abc34da996ed7fba826cb9a620299dc0bff1.tar.bz2
DevTools: Add devtools messages into the about:ipc dialog.
Review URL: http://codereview.chromium.org/60090 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13082 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/app/chrome_dll.rc18
-rw-r--r--chrome/app/chrome_dll_resource.h2
-rw-r--r--chrome/browser/views/about_ipc_dialog.cc16
3 files changed, 27 insertions, 9 deletions
diff --git a/chrome/app/chrome_dll.rc b/chrome/app/chrome_dll.rc
index 0a7e973..ce066da2 100644
--- a/chrome/app/chrome_dll.rc
+++ b/chrome/app/chrome_dll.rc
@@ -189,26 +189,28 @@ IDR_SAD_PLUGIN BINDATA "resources\\sadplugin.png"
// Dialog
//
-IDD_IPC_SETTINGS DIALOGEX 0, 0, 723, 478
+IDD_IPC_SETTINGS DIALOGEX 0, 0, 723, 558
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "IPC Logging Settings"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
- CONTROL "",IDC_View,"SysListView32",LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,7,22,170,449
- CONTROL "",IDC_ViewHost,"SysListView32",LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,187,23,170,449
+ CONTROL "",IDC_View,"SysListView32",LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,7,22,170,529
+ CONTROL "",IDC_ViewHost,"SysListView32",LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,187,22,170,529
CONTROL "",IDC_Plugin,"SysListView32",LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,367,22,170,279
CONTROL "",IDC_PluginHost,"SysListView32",LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,546,22,170,279
- CONTROL "",IDC_NPObject,"SysListView32",LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,367,333,170,138
- CONTROL "",IDC_PluginProcess,"SysListView32",LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,546,353,170,50
- CONTROL "",IDC_PluginProcessHost,"SysListView32",LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,546,421,170,50
+ CONTROL "",IDC_NPObject,"SysListView32",LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,367,326,170,145
+ CONTROL "",IDC_PluginProcess,"SysListView32",LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,546,326,170,50
+ CONTROL "",IDC_PluginProcessHost,"SysListView32",LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,546,381,170,90
+ CONTROL "",IDC_DevToolsAgent,"SysListView32",LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,367,480,170,71
+ CONTROL "",IDC_DevToolsClient,"SysListView32",LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,546,480,170,71
PUSHBUTTON "Check All",IDC_ViewAll,7,6,56,13
PUSHBUTTON "Check None",IDC_ViewNone,121,7,56,13
PUSHBUTTON "Check All",IDC_ViewHostAll,187,7,56,13
PUSHBUTTON "Check None",IDC_ViewHostNone,301,7,56,13
PUSHBUTTON "Check All",IDC_PluginAll,367,7,56,13
PUSHBUTTON "Check None",IDC_PluginNone,482,7,56,13
- PUSHBUTTON "Check All",IDC_NPObjectAll,367,317,56,13
- PUSHBUTTON "Check None",IDC_NPObjectNone,481,317,56,13
+ PUSHBUTTON "Check All",IDC_NPObjectAll,367,310,56,13
+ PUSHBUTTON "Check None",IDC_NPObjectNone,481,310,56,13
PUSHBUTTON "Check All",IDC_PluginHostAll,546,7,56,13
PUSHBUTTON "Check None",IDC_PluginHostNone,660,7,56,13
END
diff --git a/chrome/app/chrome_dll_resource.h b/chrome/app/chrome_dll_resource.h
index d89c825..7bfd289 100644
--- a/chrome/app/chrome_dll_resource.h
+++ b/chrome/app/chrome_dll_resource.h
@@ -31,6 +31,8 @@
#define IDC_NPObjectNone 4014
#define IDC_PluginHostAll 4015
#define IDC_PluginHostNone 4016
+#define IDC_DevToolsAgent 4017
+#define IDC_DevToolsClient 4018
// NOTE: Within each of the following sections, the IDs are ordered roughly by
// how they appear in the GUI/menus (left to right, top to bottom, etc.).
diff --git a/chrome/browser/views/about_ipc_dialog.cc b/chrome/browser/views/about_ipc_dialog.cc
index 6bbd356..9304c64 100644
--- a/chrome/browser/views/about_ipc_dialog.cc
+++ b/chrome/browser/views/about_ipc_dialog.cc
@@ -22,6 +22,7 @@
#include "chrome/browser/browser_process.h"
#include "chrome/browser/views/standard_layout.h"
#include "chrome/common/chrome_constants.h"
+#include "chrome/common/devtools_messages.h"
#include "chrome/common/plugin_messages.h"
#include "chrome/common/render_messages.h"
#include "chrome/views/grid_layout.h"
@@ -82,7 +83,10 @@ struct Settings {
CListViewCtrl* npobject;
CListViewCtrl* plugin_process;
CListViewCtrl* plugin_process_host;
-} settings_views = { NULL, NULL, NULL, NULL, NULL, NULL, NULL };
+ CListViewCtrl* devtools_agent;
+ CListViewCtrl* devtools_client;
+
+} settings_views = { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL };
void CreateColumn(uint16 start, uint16 end, HWND hwnd,
CListViewCtrl** control) {
@@ -143,6 +147,12 @@ void InitDialog(HWND hwnd) {
CreateColumn(PluginProcessHostStart, PluginProcessHostEnd,
::GetDlgItem(hwnd, IDC_PluginProcessHost),
&settings_views.plugin_process_host);
+ CreateColumn(DevToolsAgentStart, DevToolsAgentEnd,
+ ::GetDlgItem(hwnd, IDC_DevToolsAgent),
+ &settings_views.devtools_agent);
+ CreateColumn(DevToolsClientStart, DevToolsClientEnd,
+ ::GetDlgItem(hwnd, IDC_DevToolsClient),
+ &settings_views.devtools_client);
init_done = true;
}
@@ -153,6 +163,8 @@ void CloseDialog() {
delete settings_views.npobject;
delete settings_views.plugin_process;
delete settings_views.plugin_process_host;
+ delete settings_views.devtools_agent;
+ delete settings_views.devtools_client;
settings_views.view = NULL;
settings_views.view_host = NULL;
settings_views.plugin = NULL;
@@ -160,6 +172,8 @@ void CloseDialog() {
settings_views.npobject = NULL;
settings_views.plugin_process = NULL;
settings_views.plugin_process_host = NULL;
+ settings_views.devtools_agent = NULL;
+ settings_views.devtools_client = NULL;
init_done = false;