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

Unified Diff: chrome/browser/ui/webui/task_manager_dialog.cc

Issue 7537045: Revert 95015 - WebUI TaskManager: make it default on Chrome OS (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 5 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/frame/browser_view.cc ('k') | chrome/browser/ui/webui/task_manager_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/task_manager_dialog.cc
===================================================================
--- chrome/browser/ui/webui/task_manager_dialog.cc (revision 95017)
+++ chrome/browser/ui/webui/task_manager_dialog.cc (working copy)
@@ -20,6 +20,8 @@
static void Show();
static TaskManagerDialogImpl* GetInstance();
+ void ShowDialog();
+
protected:
friend struct DefaultSingletonTraits<TaskManagerDialogImpl>;
virtual ~TaskManagerDialogImpl();
@@ -61,7 +63,6 @@
}
private:
- void ShowDialog();
void OpenHtmlDialog();
bool is_shown_;
@@ -84,12 +85,6 @@
TaskManagerDialogImpl::~TaskManagerDialogImpl() {
}
-void TaskManagerDialogImpl::Show() {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
- TaskManagerDialogImpl* dialog = TaskManagerDialogImpl::GetInstance();
- dialog->ShowDialog();
-}
-
void TaskManagerDialogImpl::ShowDialog() {
// TODO(yoshiki): Brings up existing UI when called with is_shown_ == TRUE
if (!is_shown_) {
@@ -112,8 +107,7 @@
//
// static
void TaskManagerDialog::Show() {
- BrowserThread::PostTask(
- BrowserThread::UI, FROM_HERE,
- NewRunnableFunction(&TaskManagerDialogImpl::Show));
+ TaskManagerDialogImpl* dialog = TaskManagerDialogImpl::GetInstance();
+ dialog->ShowDialog();
}
« no previous file with comments | « chrome/browser/ui/views/frame/browser_view.cc ('k') | chrome/browser/ui/webui/task_manager_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698