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

Side by Side Diff: chrome/browser/ui/browser.cc

Issue 6312178: Highlight background pages in task manager if user clicks View Background Pages. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/chrome
Patch Set: Review feedback Created 9 years, 10 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/ui/browser.h ('k') | chrome/browser/ui/browser_window.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 #include "chrome/browser/ui/browser.h" 5 #include "chrome/browser/ui/browser.h"
6 6
7 #if defined(OS_WIN) 7 #if defined(OS_WIN)
8 #include <shellapi.h> 8 #include <shellapi.h>
9 #include <windows.h> 9 #include <windows.h>
10 #endif // OS_WIN 10 #endif // OS_WIN
(...skipping 1750 matching lines...) Expand 10 before | Expand all | Expand 10 after
1761 case DEVTOOLS_TOGGLE_ACTION_INSPECT: 1761 case DEVTOOLS_TOGGLE_ACTION_INSPECT:
1762 default: 1762 default:
1763 uma_string = "DevTools_ToggleWindow"; 1763 uma_string = "DevTools_ToggleWindow";
1764 break; 1764 break;
1765 } 1765 }
1766 UserMetrics::RecordAction(UserMetricsAction(uma_string.c_str()), profile_); 1766 UserMetrics::RecordAction(UserMetricsAction(uma_string.c_str()), profile_);
1767 DevToolsManager::GetInstance()->ToggleDevToolsWindow( 1767 DevToolsManager::GetInstance()->ToggleDevToolsWindow(
1768 GetSelectedTabContentsWrapper()->render_view_host(), action); 1768 GetSelectedTabContentsWrapper()->render_view_host(), action);
1769 } 1769 }
1770 1770
1771 void Browser::OpenTaskManager() { 1771 void Browser::OpenTaskManager(bool highlight_background_resources) {
1772 UserMetrics::RecordAction(UserMetricsAction("TaskManager"), profile_); 1772 UserMetrics::RecordAction(UserMetricsAction("TaskManager"), profile_);
1773 window_->ShowTaskManager(); 1773 if (highlight_background_resources)
1774 window_->ShowBackgroundPages();
1775 else
1776 window_->ShowTaskManager();
1774 } 1777 }
1775 1778
1776 void Browser::OpenBugReportDialog() { 1779 void Browser::OpenBugReportDialog() {
1777 UserMetrics::RecordAction(UserMetricsAction("ReportBug"), profile_); 1780 UserMetrics::RecordAction(UserMetricsAction("ReportBug"), profile_);
1778 browser::ShowHtmlBugReportView(this); 1781 browser::ShowHtmlBugReportView(this);
1779 } 1782 }
1780 1783
1781 void Browser::ToggleBookmarkBar() { 1784 void Browser::ToggleBookmarkBar() {
1782 UserMetrics::RecordAction(UserMetricsAction("ShowBookmarksBar"), profile_); 1785 UserMetrics::RecordAction(UserMetricsAction("ShowBookmarksBar"), profile_);
1783 window_->ToggleBookmarkBar(); 1786 window_->ToggleBookmarkBar();
(...skipping 471 matching lines...) Expand 10 before | Expand all | Expand 10 after
2255 case IDC_CREATE_SHORTCUTS: OpenCreateShortcutsDialog(); break; 2258 case IDC_CREATE_SHORTCUTS: OpenCreateShortcutsDialog(); break;
2256 case IDC_DEV_TOOLS: ToggleDevToolsWindow( 2259 case IDC_DEV_TOOLS: ToggleDevToolsWindow(
2257 DEVTOOLS_TOGGLE_ACTION_NONE); 2260 DEVTOOLS_TOGGLE_ACTION_NONE);
2258 break; 2261 break;
2259 case IDC_DEV_TOOLS_CONSOLE: ToggleDevToolsWindow( 2262 case IDC_DEV_TOOLS_CONSOLE: ToggleDevToolsWindow(
2260 DEVTOOLS_TOGGLE_ACTION_SHOW_CONSOLE); 2263 DEVTOOLS_TOGGLE_ACTION_SHOW_CONSOLE);
2261 break; 2264 break;
2262 case IDC_DEV_TOOLS_INSPECT: ToggleDevToolsWindow( 2265 case IDC_DEV_TOOLS_INSPECT: ToggleDevToolsWindow(
2263 DEVTOOLS_TOGGLE_ACTION_INSPECT); 2266 DEVTOOLS_TOGGLE_ACTION_INSPECT);
2264 break; 2267 break;
2265 case IDC_TASK_MANAGER: // fall through to OpenTaskManager(). 2268 case IDC_TASK_MANAGER: OpenTaskManager(false); break;
2266 case IDC_VIEW_BACKGROUND_PAGES: OpenTaskManager(); break; 2269 case IDC_VIEW_BACKGROUND_PAGES: OpenTaskManager(true); break;
2267 case IDC_FEEDBACK: OpenBugReportDialog(); break; 2270 case IDC_FEEDBACK: OpenBugReportDialog(); break;
2268 2271
2269 case IDC_SHOW_BOOKMARK_BAR: ToggleBookmarkBar(); break; 2272 case IDC_SHOW_BOOKMARK_BAR: ToggleBookmarkBar(); break;
2270 case IDC_PROFILING_ENABLED: Profiling::Toggle(); break; 2273 case IDC_PROFILING_ENABLED: Profiling::Toggle(); break;
2271 2274
2272 case IDC_SHOW_BOOKMARK_MANAGER: OpenBookmarkManager(); break; 2275 case IDC_SHOW_BOOKMARK_MANAGER: OpenBookmarkManager(); break;
2273 case IDC_SHOW_APP_MENU: ShowAppMenu(); break; 2276 case IDC_SHOW_APP_MENU: ShowAppMenu(); break;
2274 case IDC_SHOW_HISTORY: ShowHistoryTab(); break; 2277 case IDC_SHOW_HISTORY: ShowHistoryTab(); break;
2275 case IDC_SHOW_DOWNLOADS: ShowDownloadsTab(); break; 2278 case IDC_SHOW_DOWNLOADS: ShowDownloadsTab(); break;
2276 case IDC_MANAGE_EXTENSIONS: ShowExtensionsTab(); break; 2279 case IDC_MANAGE_EXTENSIONS: ShowExtensionsTab(); break;
(...skipping 2033 matching lines...) Expand 10 before | Expand all | Expand 10 after
4310 // The page transition below is only for the purpose of inserting the tab. 4313 // The page transition below is only for the purpose of inserting the tab.
4311 browser->AddTab(view_source_contents, PageTransition::LINK); 4314 browser->AddTab(view_source_contents, PageTransition::LINK);
4312 } 4315 }
4313 4316
4314 if (profile_->HasSessionService()) { 4317 if (profile_->HasSessionService()) {
4315 SessionService* session_service = profile_->GetSessionService(); 4318 SessionService* session_service = profile_->GetSessionService();
4316 if (session_service) 4319 if (session_service)
4317 session_service->TabRestored(&view_source_contents->controller(), false); 4320 session_service->TabRestored(&view_source_contents->controller(), false);
4318 } 4321 }
4319 } 4322 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser.h ('k') | chrome/browser/ui/browser_window.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698