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 1070 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1081 void BrowserView::ShowAboutChromeDialog() { | 1081 void BrowserView::ShowAboutChromeDialog() { |
1082 DoShowAboutChromeDialog(); | 1082 DoShowAboutChromeDialog(); |
1083 } | 1083 } |
1084 | 1084 |
1085 views::Widget* BrowserView::DoShowAboutChromeDialog() { | 1085 views::Widget* BrowserView::DoShowAboutChromeDialog() { |
1086 return browser::ShowAboutChromeView(GetWidget()->GetNativeWindow(), | 1086 return browser::ShowAboutChromeView(GetWidget()->GetNativeWindow(), |
1087 browser_->profile()); | 1087 browser_->profile()); |
1088 } | 1088 } |
1089 | 1089 |
1090 void BrowserView::ShowUpdateChromeDialog() { | 1090 void BrowserView::ShowUpdateChromeDialog() { |
1091 UpdateRecommendedMessageBox::ShowMessageBox(GetWidget()->GetNativeWindow()); | 1091 UpdateRecommendedMessageBox::Show(GetWidget()->GetNativeWindow()); |
1092 } | 1092 } |
1093 | 1093 |
1094 void BrowserView::ShowTaskManager() { | 1094 void BrowserView::ShowTaskManager() { |
1095 #if defined(WEBUI_TASK_MANAGER) | 1095 #if defined(WEBUI_TASK_MANAGER) |
1096 TaskManagerDialog::Show(); | 1096 TaskManagerDialog::Show(); |
1097 #else | 1097 #else |
1098 // Uses WebUI TaskManager when swiches is set. It is beta feature. | 1098 // Uses WebUI TaskManager when swiches is set. It is beta feature. |
1099 if (TaskManagerDialog::UseWebUITaskManager()) { | 1099 if (TaskManagerDialog::UseWebUITaskManager()) { |
1100 TaskManagerDialog::Show(); | 1100 TaskManagerDialog::Show(); |
1101 } else { | 1101 } else { |
(...skipping 1409 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2511 return; | 2511 return; |
2512 | 2512 |
2513 PasswordGenerationBubbleView* bubble = | 2513 PasswordGenerationBubbleView* bubble = |
2514 new PasswordGenerationBubbleView(bounds, | 2514 new PasswordGenerationBubbleView(bounds, |
2515 this, | 2515 this, |
2516 web_contents->GetRenderViewHost()); | 2516 web_contents->GetRenderViewHost()); |
2517 views::BubbleDelegateView::CreateBubble(bubble); | 2517 views::BubbleDelegateView::CreateBubble(bubble); |
2518 bubble->SetAlignment(views::BubbleBorder::ALIGN_EDGE_TO_ANCHOR_EDGE); | 2518 bubble->SetAlignment(views::BubbleBorder::ALIGN_EDGE_TO_ANCHOR_EDGE); |
2519 bubble->Show(); | 2519 bubble->Show(); |
2520 } | 2520 } |
OLD | NEW |