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 2765 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2776 } | 2776 } |
2777 | 2777 |
2778 void BrowserView::ActivateAppModalDialog() const { | 2778 void BrowserView::ActivateAppModalDialog() const { |
2779 // If another browser is app modal, flash and activate the modal browser. | 2779 // If another browser is app modal, flash and activate the modal browser. |
2780 AppModalDialog* active_dialog = | 2780 AppModalDialog* active_dialog = |
2781 AppModalDialogQueue::GetInstance()->active_dialog(); | 2781 AppModalDialogQueue::GetInstance()->active_dialog(); |
2782 if (!active_dialog) | 2782 if (!active_dialog) |
2783 return; | 2783 return; |
2784 | 2784 |
2785 Browser* modal_browser = | 2785 Browser* modal_browser = |
2786 browser::FindBrowserWithWebContents(active_dialog->web_contents()); | 2786 chrome::FindBrowserWithWebContents(active_dialog->web_contents()); |
2787 if (modal_browser && (browser_ != modal_browser)) { | 2787 if (modal_browser && (browser_ != modal_browser)) { |
2788 modal_browser->window()->FlashFrame(true); | 2788 modal_browser->window()->FlashFrame(true); |
2789 modal_browser->window()->Activate(); | 2789 modal_browser->window()->Activate(); |
2790 } | 2790 } |
2791 | 2791 |
2792 AppModalDialogQueue::GetInstance()->ActivateModalDialog(); | 2792 AppModalDialogQueue::GetInstance()->ActivateModalDialog(); |
2793 } | 2793 } |
2794 | 2794 |
2795 void BrowserView::MaybeStackBookmarkBarAtTop() { | 2795 void BrowserView::MaybeStackBookmarkBarAtTop() { |
2796 if (bookmark_bar_view_.get()) | 2796 if (bookmark_bar_view_.get()) |
2797 bookmark_bar_view_->MaybeStackAtTop(); | 2797 bookmark_bar_view_->MaybeStackAtTop(); |
2798 } | 2798 } |
OLD | NEW |