OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 // Need to include this before any other file because it defines | 5 // Need to include this before any other file because it defines |
6 // IPC_MESSAGE_LOG_ENABLED. We need to use it to define | 6 // IPC_MESSAGE_LOG_ENABLED. We need to use it to define |
7 // IPC_MESSAGE_MACROS_LOG_ENABLED so render_messages.h will generate the | 7 // IPC_MESSAGE_MACROS_LOG_ENABLED so render_messages.h will generate the |
8 // ViewMsgLog et al. functions. | 8 // ViewMsgLog et al. functions. |
9 #include "ipc/ipc_message.h" | 9 #include "ipc/ipc_message.h" |
10 | 10 |
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
215 void AboutIPCDialog::RunDialog() { | 215 void AboutIPCDialog::RunDialog() { |
216 if (!active_dialog) { | 216 if (!active_dialog) { |
217 active_dialog = new AboutIPCDialog; | 217 active_dialog = new AboutIPCDialog; |
218 views::Window::CreateChromeWindow(NULL, gfx::Rect(), active_dialog)->Show(); | 218 views::Window::CreateChromeWindow(NULL, gfx::Rect(), active_dialog)->Show(); |
219 } else { | 219 } else { |
220 // TOOD(brettw) it would be nice to focus the existing window. | 220 // TOOD(brettw) it would be nice to focus the existing window. |
221 } | 221 } |
222 } | 222 } |
223 | 223 |
224 void AboutIPCDialog::SetupControls() { | 224 void AboutIPCDialog::SetupControls() { |
225 views::GridLayout* layout = CreatePanelGridLayout(this); | 225 views::GridLayout* layout = views::GridLayout::CreatePanel(this); |
226 SetLayoutManager(layout); | 226 SetLayoutManager(layout); |
227 | 227 |
228 track_toggle_ = new views::TextButton(this, kStartTrackingLabel); | 228 track_toggle_ = new views::TextButton(this, kStartTrackingLabel); |
229 clear_button_ = new views::TextButton(this, kClearLabel); | 229 clear_button_ = new views::TextButton(this, kClearLabel); |
230 filter_button_ = new views::TextButton(this, kFilterLabel); | 230 filter_button_ = new views::TextButton(this, kFilterLabel); |
231 | 231 |
232 table_ = new views::NativeViewHost; | 232 table_ = new views::NativeViewHost; |
233 | 233 |
234 static const int first_column_set = 1; | 234 static const int first_column_set = 1; |
235 views::ColumnSet* column_set = layout->AddColumnSet(first_column_set); | 235 views::ColumnSet* column_set = layout->AddColumnSet(first_column_set); |
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
361 } | 361 } |
362 track_toggle_->SchedulePaint(); | 362 track_toggle_->SchedulePaint(); |
363 } else if (button == clear_button_) { | 363 } else if (button == clear_button_) { |
364 message_list_.DeleteAllItems(); | 364 message_list_.DeleteAllItems(); |
365 } else if (button == filter_button_) { | 365 } else if (button == filter_button_) { |
366 RunSettingsDialog(GetRootView()->GetWidget()->GetNativeView()); | 366 RunSettingsDialog(GetRootView()->GetWidget()->GetNativeView()); |
367 } | 367 } |
368 } | 368 } |
369 | 369 |
370 #endif // IPC_MESSAGE_LOG_ENABLED | 370 #endif // IPC_MESSAGE_LOG_ENABLED |
OLD | NEW |