chrome/browser/ui/views/frame/browser_view.cc - Issue 7550004: WebUI TaskManager: make it default on Chrome OS

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/views/frame/browser_view.cc

Issue 7550004: WebUI TaskManager: make it default on Chrome OS (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Move the initializing of observer before the loading. 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:

Index: chrome/browser/ui/views/frame/browser_view.cc

diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc

index 9d053ed2fda3c2828e6127d28e4db16b40499e06..103283baa7632e3635209305bd535f5cc637578c 100644

--- a/chrome/browser/ui/views/frame/browser_view.cc

+++ b/chrome/browser/ui/views/frame/browser_view.cc

@@ -1051,7 +1051,7 @@ void BrowserView::ShowCompactLocationBarUnderSelectedTab() {

}

void BrowserView::ShowTaskManager() {

-#if defined(TOUCH_UI)

+#if defined(WEBUI_TASK_MANAGER)

TaskManagerDialog::Show();

#else

// Uses WebUI TaskManager when swiches is set. It is beta feature.

@@ -1061,7 +1061,7 @@ void BrowserView::ShowTaskManager() {

} else {

browser::ShowTaskManager();

}

-#endif // defined(TOUCH_UI)

+#endif // defined(WEBUI_TASK_MANAGER)

}

void BrowserView::ShowBackgroundPages() {