Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2957)

Unified Diff: chrome/browser/ui/views/task_manager_view.cc

Issue 1722493002: Project Eraser: Kill chrome://memory. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix chrome_browser_ui.gypi. Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/views/new_task_manager_view.cc ('k') | chrome/browser/ui/webui/about_ui.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/task_manager_view.cc
diff --git a/chrome/browser/ui/views/task_manager_view.cc b/chrome/browser/ui/views/task_manager_view.cc
index 5d2cc610891f7dba3c29224640f901d5a456646d..bc34334773523187b9d24c363eafbbbf400036b9 100644
--- a/chrome/browser/ui/views/task_manager_view.cc
+++ b/chrome/browser/ui/views/task_manager_view.cc
@@ -34,8 +34,6 @@
#include "ui/gfx/canvas.h"
#include "ui/views/context_menu_controller.h"
#include "ui/views/controls/button/label_button.h"
-#include "ui/views/controls/link.h"
-#include "ui/views/controls/link_listener.h"
#include "ui/views/controls/menu/menu_runner.h"
#include "ui/views/controls/table/table_grouper.h"
#include "ui/views/controls/table/table_view.h"
@@ -150,7 +148,6 @@ void TaskManagerTableModel::OnItemsRemoved(int start, int length) {
class TaskManagerView : public views::ButtonListener,
public views::DialogDelegateView,
public views::TableViewObserver,
- public views::LinkListener,
public views::ContextMenuController,
public ui::SimpleMenuModel::Delegate {
public:
@@ -189,9 +186,6 @@ class TaskManagerView : public views::ButtonListener,
void OnDoubleClick() override;
void OnKeyDown(ui::KeyboardCode keycode) override;
- // views::LinkListener:
- void LinkClicked(views::Link* source, int event_flags) override;
-
// views::ContextMenuController:
void ShowContextMenuForView(views::View* source,
const gfx::Point& point,
@@ -218,7 +212,6 @@ class TaskManagerView : public views::ButtonListener,
bool GetSavedAlwaysOnTopState(bool* always_on_top) const;
views::LabelButton* kill_button_;
- views::Link* about_memory_link_;
views::TableView* tab_table_;
views::View* tab_table_parent_;
@@ -251,7 +244,6 @@ TaskManagerView* TaskManagerView::instance_ = NULL;
TaskManagerView::TaskManagerView()
: kill_button_(NULL),
- about_memory_link_(NULL),
tab_table_(NULL),
tab_table_parent_(NULL),
task_manager_(TaskManager::GetInstance()),
@@ -379,9 +371,6 @@ void TaskManagerView::Init() {
kill_button_ = new views::LabelButton(this,
l10n_util::GetStringUTF16(IDS_TASK_MANAGER_KILL));
kill_button_->SetStyle(views::Button::STYLE_BUTTON);
- about_memory_link_ = new views::Link(
- l10n_util::GetStringUTF16(IDS_TASK_MANAGER_ABOUT_MEMORY_LINK));
- about_memory_link_->set_listener(this);
// Makes sure our state is consistent.
OnSelectionChanged();
@@ -393,20 +382,17 @@ void TaskManagerView::Init() {
void TaskManagerView::ViewHierarchyChanged(
const ViewHierarchyChangedDetails& details) {
views::DialogDelegateView::ViewHierarchyChanged(details);
- // Since we want the Kill button and the Memory Details link to show up in
- // the same visual row as the close button, which is provided by the
- // framework, we must add the buttons to the non-client view, which is the
- // parent of this view. Similarly, when we're removed from the view
- // hierarchy, we must take care to clean up those items as well.
+ // Since we want the Kill button to show up in the same visual row as the
+ // close button, which is provided by the framework, we must add it to the
+ // non-client view, which is the parent of this view. Similarly, when we're
+ // removed from the view hierarchy, we must take care to clean up that item.
if (details.child == this) {
if (details.is_add) {
- details.parent->AddChildView(about_memory_link_);
details.parent->AddChildView(kill_button_);
tab_table_parent_ = tab_table_->CreateParentIfNecessary();
AddChildView(tab_table_parent_);
} else {
details.parent->RemoveChildView(kill_button_);
- details.parent->RemoveChildView(about_memory_link_);
}
}
}
@@ -420,12 +406,6 @@ void TaskManagerView::Layout() {
int y_buttons = parent_bounds.bottom() - size.height() - vertical_margin;
kill_button_->SetBounds(x, y_buttons, size.width(), size.height());
- size = about_memory_link_->GetPreferredSize();
- about_memory_link_->SetBounds(
- horizontal_margin,
- y_buttons + (kill_button_->height() - size.height()) / 2,
- size.width(), size.height());
-
gfx::Rect rect = GetLocalBounds();
rect.Inset(horizontal_margin, views::kPanelVertMargin);
rect.Inset(0, 0, 0,
@@ -570,11 +550,6 @@ void TaskManagerView::OnKeyDown(ui::KeyboardCode keycode) {
ActivateFocusedTab();
}
-void TaskManagerView::LinkClicked(views::Link* source, int event_flags) {
- DCHECK_EQ(about_memory_link_, source);
- task_manager_->OpenAboutMemory();
-}
-
void TaskManagerView::ShowContextMenuForView(views::View* source,
const gfx::Point& point,
ui::MenuSourceType source_type) {
« no previous file with comments | « chrome/browser/ui/views/new_task_manager_view.cc ('k') | chrome/browser/ui/webui/about_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698