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 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
109 #include "ui/views/widget/native_widget.h" | 109 #include "ui/views/widget/native_widget.h" |
110 #include "ui/views/widget/root_view.h" | 110 #include "ui/views/widget/root_view.h" |
111 #include "ui/views/widget/widget.h" | 111 #include "ui/views/widget/widget.h" |
112 #include "ui/views/window/dialog_delegate.h" | 112 #include "ui/views/window/dialog_delegate.h" |
113 | 113 |
114 #if defined(USE_ASH) | 114 #if defined(USE_ASH) |
115 #include "ash/launcher/launcher.h" | 115 #include "ash/launcher/launcher.h" |
116 #include "ash/launcher/launcher_model.h" | 116 #include "ash/launcher/launcher_model.h" |
117 #include "ash/shell.h" | 117 #include "ash/shell.h" |
118 #include "chrome/browser/ui/ash/ash_util.h" | 118 #include "chrome/browser/ui/ash/ash_util.h" |
| 119 #include "chrome/browser/ui/ash/chrome_shell_delegate.h" |
119 #include "chrome/browser/ui/ash/launcher/browser_launcher_item_controller.h" | 120 #include "chrome/browser/ui/ash/launcher/browser_launcher_item_controller.h" |
120 #include "chrome/browser/ui/views/ash/chrome_shell_delegate.h" | |
121 #include "chrome/browser/ui/ash/window_positioner.h" | 121 #include "chrome/browser/ui/ash/window_positioner.h" |
122 #elif defined(OS_WIN) && !defined(USE_AURA) | 122 #elif defined(OS_WIN) && !defined(USE_AURA) |
123 #include "base/win/metro.h" | 123 #include "base/win/metro.h" |
124 #include "chrome/browser/jumplist_win.h" | 124 #include "chrome/browser/jumplist_win.h" |
125 #include "chrome/browser/ui/views/omnibox/omnibox_view_win.h" | 125 #include "chrome/browser/ui/views/omnibox/omnibox_view_win.h" |
126 #include "ui/views/widget/native_widget_win.h" | 126 #include "ui/views/widget/native_widget_win.h" |
127 #endif | 127 #endif |
128 | 128 |
129 #if defined(USE_AURA) | 129 #if defined(USE_AURA) |
130 #include "chrome/browser/ui/views/accelerator_table.h" | 130 #include "chrome/browser/ui/views/accelerator_table.h" |
(...skipping 2466 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2597 | 2597 |
2598 Browser* modal_browser = | 2598 Browser* modal_browser = |
2599 browser::FindBrowserWithWebContents(active_dialog->web_contents()); | 2599 browser::FindBrowserWithWebContents(active_dialog->web_contents()); |
2600 if (modal_browser && (browser_ != modal_browser)) { | 2600 if (modal_browser && (browser_ != modal_browser)) { |
2601 modal_browser->window()->FlashFrame(true); | 2601 modal_browser->window()->FlashFrame(true); |
2602 modal_browser->window()->Activate(); | 2602 modal_browser->window()->Activate(); |
2603 } | 2603 } |
2604 | 2604 |
2605 AppModalDialogQueue::GetInstance()->ActivateModalDialog(); | 2605 AppModalDialogQueue::GetInstance()->ActivateModalDialog(); |
2606 } | 2606 } |
OLD | NEW |