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

Side by Side Diff: chrome/browser/ui/views/frame/browser_view.cc

Issue 7520011: 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 unified diff | Download patch | Annotate | Revision Log
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/views/frame/browser_view.h" 5 #include "chrome/browser/ui/views/frame/browser_view.h"
6 6
7 #if defined(TOOLKIT_USES_GTK) 7 #if defined(TOOLKIT_USES_GTK)
8 #include <gtk/gtk.h> 8 #include <gtk/gtk.h>
9 #endif 9 #endif
10 10
(...skipping 1033 matching lines...) Expand 10 before | Expand all | Expand 10 after
1044 } 1044 }
1045 1045
1046 void BrowserView::ShowCompactLocationBarUnderSelectedTab() { 1046 void BrowserView::ShowCompactLocationBarUnderSelectedTab() {
1047 if (!UseCompactNavigationBar()) 1047 if (!UseCompactNavigationBar())
1048 return; 1048 return;
1049 compact_location_bar_view_host_->UpdateOnTabChange(browser()->active_index(), 1049 compact_location_bar_view_host_->UpdateOnTabChange(browser()->active_index(),
1050 true); 1050 true);
1051 } 1051 }
1052 1052
1053 void BrowserView::ShowTaskManager() { 1053 void BrowserView::ShowTaskManager() {
1054 #if defined(TOUCH_UI) 1054 #if defined(WEBUI_TASK_MANAGER)
1055 TaskManagerDialog::Show(); 1055 TaskManagerDialog::Show();
1056 #else 1056 #else
1057 // Uses WebUI TaskManager when swiches is set. It is beta feature. 1057 // Uses WebUI TaskManager when swiches is set. It is beta feature.
1058 if (CommandLine::ForCurrentProcess() 1058 if (CommandLine::ForCurrentProcess()
1059 ->HasSwitch(switches::kEnableWebUITaskManager)) { 1059 ->HasSwitch(switches::kEnableWebUITaskManager)) {
1060 TaskManagerDialog::Show(); 1060 TaskManagerDialog::Show();
1061 } else { 1061 } else {
1062 browser::ShowTaskManager(); 1062 browser::ShowTaskManager();
1063 } 1063 }
1064 #endif // defined(TOUCH_UI) 1064 #endif // defined(WEBUI_TASK_MANAGER)
1065 } 1065 }
1066 1066
1067 void BrowserView::ShowBackgroundPages() { 1067 void BrowserView::ShowBackgroundPages() {
1068 browser::ShowBackgroundPages(); 1068 browser::ShowBackgroundPages();
1069 } 1069 }
1070 1070
1071 void BrowserView::ShowBookmarkBubble(const GURL& url, bool already_bookmarked) { 1071 void BrowserView::ShowBookmarkBubble(const GURL& url, bool already_bookmarked) {
1072 GetLocationBarView()->ShowStarBubble(url, !already_bookmarked); 1072 GetLocationBarView()->ShowStarBubble(url, !already_bookmarked);
1073 } 1073 }
1074 1074
(...skipping 1576 matching lines...) Expand 10 before | Expand all | Expand 10 after
2651 view->GetWidget()->non_client_view()->SetAccessibleName( 2651 view->GetWidget()->non_client_view()->SetAccessibleName(
2652 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)); 2652 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
2653 return view; 2653 return view;
2654 } 2654 }
2655 #endif 2655 #endif
2656 2656
2657 // static 2657 // static
2658 FindBar* BrowserWindow::CreateFindBar(Browser* browser) { 2658 FindBar* BrowserWindow::CreateFindBar(Browser* browser) {
2659 return browser::CreateFindBar(static_cast<BrowserView*>(browser->window())); 2659 return browser::CreateFindBar(static_cast<BrowserView*>(browser->window()));
2660 } 2660 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698