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

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

Issue 11975038: Implement rough new Views task manager style. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Use 'Chrome Style' TextButtons instead. Created 7 years, 11 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 | « no previous file | ui/views/widget/widget.h » ('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 2312109bbf306ddb3c25b0e8e641b939e2d59ee3..1ad3844e67cd8c31b61dbb5643b8b12ea1804d29 100644
--- a/chrome/browser/ui/views/task_manager_view.cc
+++ b/chrome/browser/ui/views/task_manager_view.cc
@@ -28,6 +28,7 @@
#include "ui/base/models/table_model_observer.h"
#include "ui/views/background.h"
#include "ui/views/context_menu_controller.h"
+#include "ui/views/controls/button/chrome_style.h"
#include "ui/views/controls/button/text_button.h"
#include "ui/views/controls/link.h"
#include "ui/views/controls/link_listener.h"
@@ -418,9 +419,13 @@ void TaskManagerView::Init() {
switches::kPurgeMemoryButton)) {
purge_memory_button_ = new views::NativeTextButton(this,
l10n_util::GetStringUTF16(IDS_TASK_MANAGER_PURGE_MEMORY));
+ if (DialogDelegate::UseNewStyle())
+ views::ApplyChromeStyle(purge_memory_button_);
}
kill_button_ = new views::NativeTextButton(this,
l10n_util::GetStringUTF16(IDS_TASK_MANAGER_KILL));
+ if (DialogDelegate::UseNewStyle())
+ views::ApplyChromeStyle(kill_button_);
about_memory_link_ = new views::Link(
l10n_util::GetStringUTF16(IDS_TASK_MANAGER_ABOUT_MEMORY_LINK));
about_memory_link_->set_listener(this);
@@ -546,7 +551,19 @@ void TaskManagerView::Show(bool highlight_background_resources,
}
}
instance_ = new TaskManagerView(highlight_background_resources, desktop_type);
- views::Widget::CreateWindow(instance_);
+
+ views::Widget* widget = new views::Widget;
+ views::Widget::InitParams params;
+ params.delegate = instance_;
+ if (DialogDelegate::UseNewStyle()) {
+ // TODO(msw): Use table_view_views or support dialog transparency and native
+ // controls (e.g. table_view_win) via a second dialog Widget (like bubbles).
+ // params.transparent = true;
+ params.remove_standard_frame = true;
+ }
+ params.top_level = true;
+ widget->Init(params);
+
instance_->InitAlwaysOnTopState();
instance_->model_->StartUpdating();
instance_->GetWidget()->Show();
« no previous file with comments | « no previous file | ui/views/widget/widget.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698