| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 1030 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1041 Profile* profile) { | 1041 Profile* profile) { |
| 1042 browser::EditSearchEngine(GetWidget()->GetNativeWindow(), template_url, NULL, | 1042 browser::EditSearchEngine(GetWidget()->GetNativeWindow(), template_url, NULL, |
| 1043 profile); | 1043 profile); |
| 1044 } | 1044 } |
| 1045 | 1045 |
| 1046 void BrowserView::ToggleBookmarkBar() { | 1046 void BrowserView::ToggleBookmarkBar() { |
| 1047 bookmark_utils::ToggleWhenVisible(browser_->profile()); | 1047 bookmark_utils::ToggleWhenVisible(browser_->profile()); |
| 1048 } | 1048 } |
| 1049 | 1049 |
| 1050 void BrowserView::ShowAboutChromeDialog() { | 1050 void BrowserView::ShowAboutChromeDialog() { |
| 1051 DoShowAboutChromeDialog(); | 1051 browser::ShowAboutChromeView(GetWidget()->GetNativeWindow(), |
| 1052 } | 1052 browser_->profile()); |
| 1053 | |
| 1054 views::Widget* BrowserView::DoShowAboutChromeDialog() { | |
| 1055 return browser::ShowAboutChromeView(GetWidget()->GetNativeWindow(), | |
| 1056 browser_->profile()); | |
| 1057 } | 1053 } |
| 1058 | 1054 |
| 1059 void BrowserView::ShowUpdateChromeDialog() { | 1055 void BrowserView::ShowUpdateChromeDialog() { |
| 1060 UpdateRecommendedMessageBox::Show(GetWidget()->GetNativeWindow()); | 1056 UpdateRecommendedMessageBox::Show(GetWidget()->GetNativeWindow()); |
| 1061 } | 1057 } |
| 1062 | 1058 |
| 1063 void BrowserView::ShowTaskManager() { | 1059 void BrowserView::ShowTaskManager() { |
| 1064 #if defined(USE_AURA) | 1060 #if defined(USE_AURA) |
| 1065 TaskManagerDialog::Show(); | 1061 TaskManagerDialog::Show(); |
| 1066 #else | 1062 #else |
| (...skipping 1406 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2473 this, | 2469 this, |
| 2474 tab_contents->web_contents()->GetRenderViewHost(), | 2470 tab_contents->web_contents()->GetRenderViewHost(), |
| 2475 password_generator, | 2471 password_generator, |
| 2476 browser_.get(), | 2472 browser_.get(), |
| 2477 tab_contents->password_manager()); | 2473 tab_contents->password_manager()); |
| 2478 | 2474 |
| 2479 views::BubbleDelegateView::CreateBubble(bubble); | 2475 views::BubbleDelegateView::CreateBubble(bubble); |
| 2480 bubble->SetAlignment(views::BubbleBorder::ALIGN_ARROW_TO_MID_ANCHOR); | 2476 bubble->SetAlignment(views::BubbleBorder::ALIGN_ARROW_TO_MID_ANCHOR); |
| 2481 bubble->Show(); | 2477 bubble->Show(); |
| 2482 } | 2478 } |
| OLD | NEW |