| OLD | NEW |
| 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 1176 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1187 } | 1187 } |
| 1188 | 1188 |
| 1189 void BrowserView::ToggleBookmarkBar() { | 1189 void BrowserView::ToggleBookmarkBar() { |
| 1190 chrome::ToggleBookmarkBarWhenVisible(browser_->profile()); | 1190 chrome::ToggleBookmarkBarWhenVisible(browser_->profile()); |
| 1191 } | 1191 } |
| 1192 | 1192 |
| 1193 void BrowserView::ShowUpdateChromeDialog() { | 1193 void BrowserView::ShowUpdateChromeDialog() { |
| 1194 UpdateRecommendedMessageBox::Show(GetWidget()->GetNativeWindow()); | 1194 UpdateRecommendedMessageBox::Show(GetWidget()->GetNativeWindow()); |
| 1195 } | 1195 } |
| 1196 | 1196 |
| 1197 void BrowserView::ShowTaskManager() { | |
| 1198 chrome::ShowTaskManager(browser()); | |
| 1199 } | |
| 1200 | |
| 1201 void BrowserView::ShowBackgroundPages() { | |
| 1202 chrome::ShowBackgroundPages(browser()); | |
| 1203 } | |
| 1204 | |
| 1205 void BrowserView::ShowBookmarkBubble(const GURL& url, bool already_bookmarked) { | 1197 void BrowserView::ShowBookmarkBubble(const GURL& url, bool already_bookmarked) { |
| 1206 chrome::ShowBookmarkBubbleView(GetToolbarView()->GetBookmarkBubbleAnchor(), | 1198 chrome::ShowBookmarkBubbleView(GetToolbarView()->GetBookmarkBubbleAnchor(), |
| 1207 bookmark_bar_view_.get(), browser_->profile(), | 1199 bookmark_bar_view_.get(), browser_->profile(), |
| 1208 url, !already_bookmarked); | 1200 url, !already_bookmarked); |
| 1209 } | 1201 } |
| 1210 | 1202 |
| 1211 void BrowserView::ShowBookmarkPrompt() { | 1203 void BrowserView::ShowBookmarkPrompt() { |
| 1212 GetLocationBarView()->ShowBookmarkPrompt(); | 1204 GetLocationBarView()->ShowBookmarkPrompt(); |
| 1213 } | 1205 } |
| 1214 | 1206 |
| (...skipping 1495 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2710 | 2702 |
| 2711 Browser* modal_browser = | 2703 Browser* modal_browser = |
| 2712 chrome::FindBrowserWithWebContents(active_dialog->web_contents()); | 2704 chrome::FindBrowserWithWebContents(active_dialog->web_contents()); |
| 2713 if (modal_browser && (browser_ != modal_browser)) { | 2705 if (modal_browser && (browser_ != modal_browser)) { |
| 2714 modal_browser->window()->FlashFrame(true); | 2706 modal_browser->window()->FlashFrame(true); |
| 2715 modal_browser->window()->Activate(); | 2707 modal_browser->window()->Activate(); |
| 2716 } | 2708 } |
| 2717 | 2709 |
| 2718 AppModalDialogQueue::GetInstance()->ActivateModalDialog(); | 2710 AppModalDialogQueue::GetInstance()->ActivateModalDialog(); |
| 2719 } | 2711 } |
| OLD | NEW |