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 1090 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1101 | 1101 |
1102 void BrowserView::ConfirmBrowserCloseWithPendingDownloads() { | 1102 void BrowserView::ConfirmBrowserCloseWithPendingDownloads() { |
1103 DownloadInProgressDialogView::Show(browser_.get(), GetNativeHandle()); | 1103 DownloadInProgressDialogView::Show(browser_.get(), GetNativeHandle()); |
1104 } | 1104 } |
1105 | 1105 |
1106 void BrowserView::ShowCreateWebAppShortcutsDialog( | 1106 void BrowserView::ShowCreateWebAppShortcutsDialog( |
1107 TabContentsWrapper* tab_contents) { | 1107 TabContentsWrapper* tab_contents) { |
1108 browser::ShowCreateWebAppShortcutsDialog(GetNativeHandle(), tab_contents); | 1108 browser::ShowCreateWebAppShortcutsDialog(GetNativeHandle(), tab_contents); |
1109 } | 1109 } |
1110 | 1110 |
1111 void BrowserView::ShowCreateChromeAppShortcutsDialog(Profile* profile, | 1111 void BrowserView::ShowCreateChromeAppShortcutsDialog( |
1112 const Extension* app) { | 1112 Profile* profile, |
| 1113 const extensions::Extension* app) { |
1113 browser::ShowCreateChromeAppShortcutsDialog(GetNativeHandle(), profile, app); | 1114 browser::ShowCreateChromeAppShortcutsDialog(GetNativeHandle(), profile, app); |
1114 } | 1115 } |
1115 | 1116 |
1116 void BrowserView::UserChangedTheme() { | 1117 void BrowserView::UserChangedTheme() { |
1117 frame_->FrameTypeChanged(); | 1118 frame_->FrameTypeChanged(); |
1118 } | 1119 } |
1119 | 1120 |
1120 int BrowserView::GetExtraRenderViewHeight() const { | 1121 int BrowserView::GetExtraRenderViewHeight() const { |
1121 // Currently this is only used on linux. | 1122 // Currently this is only used on linux. |
1122 return 0; | 1123 return 0; |
(...skipping 1285 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2408 return; | 2409 return; |
2409 | 2410 |
2410 PasswordGenerationBubbleView* bubble = | 2411 PasswordGenerationBubbleView* bubble = |
2411 new PasswordGenerationBubbleView(bounds, | 2412 new PasswordGenerationBubbleView(bounds, |
2412 this, | 2413 this, |
2413 web_contents->GetRenderViewHost()); | 2414 web_contents->GetRenderViewHost()); |
2414 views::BubbleDelegateView::CreateBubble(bubble); | 2415 views::BubbleDelegateView::CreateBubble(bubble); |
2415 bubble->SetAlignment(views::BubbleBorder::ALIGN_EDGE_TO_ANCHOR_EDGE); | 2416 bubble->SetAlignment(views::BubbleBorder::ALIGN_EDGE_TO_ANCHOR_EDGE); |
2416 bubble->Show(); | 2417 bubble->Show(); |
2417 } | 2418 } |
OLD | NEW |