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 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
55 #include "chrome/browser/ui/views/accelerator_table.h" | 55 #include "chrome/browser/ui/views/accelerator_table.h" |
56 #include "chrome/browser/ui/views/accessibility/invert_bubble_view.h" | 56 #include "chrome/browser/ui/views/accessibility/invert_bubble_view.h" |
57 #include "chrome/browser/ui/views/avatar_menu_bubble_view.h" | 57 #include "chrome/browser/ui/views/avatar_menu_bubble_view.h" |
58 #include "chrome/browser/ui/views/avatar_menu_button.h" | 58 #include "chrome/browser/ui/views/avatar_menu_button.h" |
59 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h" | 59 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h" |
60 #include "chrome/browser/ui/views/browser_dialogs.h" | 60 #include "chrome/browser/ui/views/browser_dialogs.h" |
61 #include "chrome/browser/ui/views/download/download_in_progress_dialog_view.h" | 61 #include "chrome/browser/ui/views/download/download_in_progress_dialog_view.h" |
62 #include "chrome/browser/ui/views/download/download_shelf_view.h" | 62 #include "chrome/browser/ui/views/download/download_shelf_view.h" |
63 #include "chrome/browser/ui/views/frame/browser_view_layout.h" | 63 #include "chrome/browser/ui/views/frame/browser_view_layout.h" |
64 #include "chrome/browser/ui/views/frame/contents_container.h" | 64 #include "chrome/browser/ui/views/frame/contents_container.h" |
| 65 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h" |
65 #include "chrome/browser/ui/views/frame/instant_overlay_controller_views.h" | 66 #include "chrome/browser/ui/views/frame/instant_overlay_controller_views.h" |
66 #include "chrome/browser/ui/views/frame/top_container_view.h" | 67 #include "chrome/browser/ui/views/frame/top_container_view.h" |
67 #include "chrome/browser/ui/views/fullscreen_exit_bubble_views.h" | 68 #include "chrome/browser/ui/views/fullscreen_exit_bubble_views.h" |
68 #include "chrome/browser/ui/views/immersive_mode_controller.h" | |
69 #include "chrome/browser/ui/views/infobars/infobar_container_view.h" | 69 #include "chrome/browser/ui/views/infobars/infobar_container_view.h" |
70 #include "chrome/browser/ui/views/location_bar/location_icon_view.h" | 70 #include "chrome/browser/ui/views/location_bar/location_icon_view.h" |
71 #include "chrome/browser/ui/views/omnibox/omnibox_view_views.h" | 71 #include "chrome/browser/ui/views/omnibox/omnibox_view_views.h" |
72 #include "chrome/browser/ui/views/omnibox/omnibox_views.h" | 72 #include "chrome/browser/ui/views/omnibox/omnibox_views.h" |
73 #include "chrome/browser/ui/views/password_generation_bubble_view.h" | 73 #include "chrome/browser/ui/views/password_generation_bubble_view.h" |
74 #include "chrome/browser/ui/views/status_bubble_views.h" | 74 #include "chrome/browser/ui/views/status_bubble_views.h" |
75 #include "chrome/browser/ui/views/tabs/browser_tab_strip_controller.h" | 75 #include "chrome/browser/ui/views/tabs/browser_tab_strip_controller.h" |
76 #include "chrome/browser/ui/views/tabs/tab.h" | 76 #include "chrome/browser/ui/views/tabs/tab.h" |
77 #include "chrome/browser/ui/views/tabs/tab_strip.h" | 77 #include "chrome/browser/ui/views/tabs/tab_strip.h" |
78 #include "chrome/browser/ui/views/toolbar_view.h" | 78 #include "chrome/browser/ui/views/toolbar_view.h" |
(...skipping 2631 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 |