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 2625 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2636 bounds, | 2636 bounds, |
2637 this, | 2637 this, |
2638 web_contents->GetRenderViewHost(), | 2638 web_contents->GetRenderViewHost(), |
2639 PasswordManager::FromWebContents(web_contents), | 2639 PasswordManager::FromWebContents(web_contents), |
2640 password_generator, | 2640 password_generator, |
2641 browser_.get(), | 2641 browser_.get(), |
2642 GetWidget()->GetThemeProvider()); | 2642 GetWidget()->GetThemeProvider()); |
2643 | 2643 |
2644 views::BubbleDelegateView::CreateBubble(bubble); | 2644 views::BubbleDelegateView::CreateBubble(bubble); |
2645 bubble->SetAlignment(views::BubbleBorder::ALIGN_ARROW_TO_MID_ANCHOR); | 2645 bubble->SetAlignment(views::BubbleBorder::ALIGN_ARROW_TO_MID_ANCHOR); |
2646 bubble->Show(); | 2646 bubble->GetWidget()->Show(); |
2647 } | 2647 } |
2648 | 2648 |
2649 void BrowserView::DoCutCopyPaste(void (content::RenderWidgetHost::*method)(), | 2649 void BrowserView::DoCutCopyPaste(void (content::RenderWidgetHost::*method)(), |
2650 #if defined(OS_WIN) | 2650 #if defined(OS_WIN) |
2651 int windows_msg_id, | 2651 int windows_msg_id, |
2652 #endif | 2652 #endif |
2653 int command_id) { | 2653 int command_id) { |
2654 WebContents* contents = browser_->tab_strip_model()->GetActiveWebContents(); | 2654 WebContents* contents = browser_->tab_strip_model()->GetActiveWebContents(); |
2655 if (!contents) | 2655 if (!contents) |
2656 return; | 2656 return; |
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2710 | 2710 |
2711 Browser* modal_browser = | 2711 Browser* modal_browser = |
2712 chrome::FindBrowserWithWebContents(active_dialog->web_contents()); | 2712 chrome::FindBrowserWithWebContents(active_dialog->web_contents()); |
2713 if (modal_browser && (browser_ != modal_browser)) { | 2713 if (modal_browser && (browser_ != modal_browser)) { |
2714 modal_browser->window()->FlashFrame(true); | 2714 modal_browser->window()->FlashFrame(true); |
2715 modal_browser->window()->Activate(); | 2715 modal_browser->window()->Activate(); |
2716 } | 2716 } |
2717 | 2717 |
2718 AppModalDialogQueue::GetInstance()->ActivateModalDialog(); | 2718 AppModalDialogQueue::GetInstance()->ActivateModalDialog(); |
2719 } | 2719 } |
OLD | NEW |