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

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

Issue 12026016: Implement new Task Manager and Edit Bookmark style, etc. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address comment. 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 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 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/auto_reset.h" 9 #include "base/auto_reset.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 1270 matching lines...) Expand 10 before | Expand all | Expand 10 after
1281 } 1281 }
1282 1282
1283 void BrowserView::ToggleBookmarkBar() { 1283 void BrowserView::ToggleBookmarkBar() {
1284 chrome::ToggleBookmarkBarWhenVisible(browser_->profile()); 1284 chrome::ToggleBookmarkBarWhenVisible(browser_->profile());
1285 } 1285 }
1286 1286
1287 void BrowserView::ShowUpdateChromeDialog() { 1287 void BrowserView::ShowUpdateChromeDialog() {
1288 UpdateRecommendedMessageBox::Show(GetWidget()->GetNativeWindow()); 1288 UpdateRecommendedMessageBox::Show(GetWidget()->GetNativeWindow());
1289 } 1289 }
1290 1290
1291 void BrowserView::ShowTaskManager(chrome::HostDesktopType desktop_type) { 1291 void BrowserView::ShowTaskManager() {
1292 #if defined(USE_AURA) 1292 #if defined(USE_AURA)
1293 TaskManagerDialog::Show(); 1293 TaskManagerDialog::Show();
1294 #else 1294 #else
1295 chrome::ShowTaskManager(desktop_type); 1295 chrome::ShowTaskManager(browser());
1296 #endif // defined(USE_AURA) 1296 #endif // defined(USE_AURA)
1297 } 1297 }
1298 1298
1299 void BrowserView::ShowBackgroundPages(chrome::HostDesktopType desktop_type) { 1299 void BrowserView::ShowBackgroundPages() {
1300 #if defined(USE_AURA) 1300 #if defined(USE_AURA)
1301 TaskManagerDialog::ShowBackgroundPages(); 1301 TaskManagerDialog::ShowBackgroundPages();
1302 #else 1302 #else
1303 chrome::ShowBackgroundPages(desktop_type); 1303 chrome::ShowBackgroundPages(browser());
1304 #endif // defined(USE_AURA) 1304 #endif // defined(USE_AURA)
1305 } 1305 }
1306 1306
1307 void BrowserView::ShowBookmarkBubble(const GURL& url, bool already_bookmarked) { 1307 void BrowserView::ShowBookmarkBubble(const GURL& url, bool already_bookmarked) {
1308 chrome::ShowBookmarkBubbleView(GetToolbarView()->GetBookmarkBubbleAnchor(), 1308 chrome::ShowBookmarkBubbleView(GetToolbarView()->GetBookmarkBubbleAnchor(),
1309 bookmark_bar_view_.get(), browser_->profile(), 1309 bookmark_bar_view_.get(), browser_->profile(),
1310 url, !already_bookmarked); 1310 url, !already_bookmarked);
1311 } 1311 }
1312 1312
1313 void BrowserView::ShowBookmarkPrompt() { 1313 void BrowserView::ShowBookmarkPrompt() {
(...skipping 1499 matching lines...) Expand 10 before | Expand all | Expand 10 after
2813 modal_browser->window()->Activate(); 2813 modal_browser->window()->Activate();
2814 } 2814 }
2815 2815
2816 AppModalDialogQueue::GetInstance()->ActivateModalDialog(); 2816 AppModalDialogQueue::GetInstance()->ActivateModalDialog();
2817 } 2817 }
2818 2818
2819 void BrowserView::MaybeStackBookmarkBarAtTop() { 2819 void BrowserView::MaybeStackBookmarkBarAtTop() {
2820 if (bookmark_bar_view_.get()) 2820 if (bookmark_bar_view_.get())
2821 bookmark_bar_view_->MaybeStackAtTop(); 2821 bookmark_bar_view_->MaybeStackAtTop();
2822 } 2822 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/frame/browser_view.h ('k') | chrome/browser/ui/views/task_manager_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698