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 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
96 #include "ui/base/accessibility/accessible_view_state.h" | 96 #include "ui/base/accessibility/accessible_view_state.h" |
97 #include "ui/base/hit_test.h" | 97 #include "ui/base/hit_test.h" |
98 #include "ui/base/l10n/l10n_util.h" | 98 #include "ui/base/l10n/l10n_util.h" |
99 #include "ui/base/resource/resource_bundle.h" | 99 #include "ui/base/resource/resource_bundle.h" |
100 #include "ui/gfx/canvas.h" | 100 #include "ui/gfx/canvas.h" |
101 #include "ui/gfx/color_utils.h" | 101 #include "ui/gfx/color_utils.h" |
102 #include "ui/gfx/sys_color_change_listener.h" | 102 #include "ui/gfx/sys_color_change_listener.h" |
103 #include "ui/ui_controls/ui_controls.h" | 103 #include "ui/ui_controls/ui_controls.h" |
104 #include "ui/views/controls/single_split_view.h" | 104 #include "ui/views/controls/single_split_view.h" |
105 #include "ui/views/controls/webview/webview.h" | 105 #include "ui/views/controls/webview/webview.h" |
106 #include "ui/views/events/event.h" | |
107 #include "ui/views/focus/external_focus_tracker.h" | 106 #include "ui/views/focus/external_focus_tracker.h" |
108 #include "ui/views/focus/view_storage.h" | 107 #include "ui/views/focus/view_storage.h" |
109 #include "ui/views/layout/grid_layout.h" | 108 #include "ui/views/layout/grid_layout.h" |
110 #include "ui/views/widget/native_widget.h" | 109 #include "ui/views/widget/native_widget.h" |
111 #include "ui/views/widget/root_view.h" | 110 #include "ui/views/widget/root_view.h" |
112 #include "ui/views/widget/widget.h" | 111 #include "ui/views/widget/widget.h" |
113 #include "ui/views/window/dialog_delegate.h" | 112 #include "ui/views/window/dialog_delegate.h" |
114 | 113 |
115 #if defined(USE_ASH) | 114 #if defined(USE_ASH) |
116 #include "ash/launcher/launcher.h" | 115 #include "ash/launcher/launcher.h" |
(...skipping 2486 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2603 | 2602 |
2604 Browser* modal_browser = | 2603 Browser* modal_browser = |
2605 browser::FindBrowserWithWebContents(active_dialog->web_contents()); | 2604 browser::FindBrowserWithWebContents(active_dialog->web_contents()); |
2606 if (modal_browser && (browser_ != modal_browser)) { | 2605 if (modal_browser && (browser_ != modal_browser)) { |
2607 modal_browser->window()->FlashFrame(true); | 2606 modal_browser->window()->FlashFrame(true); |
2608 modal_browser->window()->Activate(); | 2607 modal_browser->window()->Activate(); |
2609 } | 2608 } |
2610 | 2609 |
2611 AppModalDialogQueue::GetInstance()->ActivateModalDialog(); | 2610 AppModalDialogQueue::GetInstance()->ActivateModalDialog(); |
2612 } | 2611 } |
OLD | NEW |