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 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
150 #include "chrome/browser/ui/views/sync/one_click_signin_bubble_view.h" | 150 #include "chrome/browser/ui/views/sync/one_click_signin_bubble_view.h" |
151 #endif | 151 #endif |
152 | 152 |
153 using base::TimeDelta; | 153 using base::TimeDelta; |
154 using content::NativeWebKeyboardEvent; | 154 using content::NativeWebKeyboardEvent; |
155 using content::SSLStatus; | 155 using content::SSLStatus; |
156 using content::UserMetricsAction; | 156 using content::UserMetricsAction; |
157 using content::WebContents; | 157 using content::WebContents; |
158 using views::ColumnSet; | 158 using views::ColumnSet; |
159 using views::GridLayout; | 159 using views::GridLayout; |
| 160 using web_modal::WebContentsModalDialogHost; |
160 | 161 |
161 namespace { | 162 namespace { |
162 // The height of the status bubble. | 163 // The height of the status bubble. |
163 const int kStatusBubbleHeight = 20; | 164 const int kStatusBubbleHeight = 20; |
164 // The name of a key to store on the window handle so that other code can | 165 // The name of a key to store on the window handle so that other code can |
165 // locate this object using just the handle. | 166 // locate this object using just the handle. |
166 const char* const kBrowserViewKey = "__BROWSER_VIEW__"; | 167 const char* const kBrowserViewKey = "__BROWSER_VIEW__"; |
167 | 168 |
168 // The number of milliseconds between loading animation frames. | 169 // The number of milliseconds between loading animation frames. |
169 const int kLoadingAnimationFrameTimeMs = 30; | 170 const int kLoadingAnimationFrameTimeMs = 30; |
(...skipping 2460 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2630 | 2631 |
2631 Browser* modal_browser = | 2632 Browser* modal_browser = |
2632 chrome::FindBrowserWithWebContents(active_dialog->web_contents()); | 2633 chrome::FindBrowserWithWebContents(active_dialog->web_contents()); |
2633 if (modal_browser && (browser_ != modal_browser)) { | 2634 if (modal_browser && (browser_ != modal_browser)) { |
2634 modal_browser->window()->FlashFrame(true); | 2635 modal_browser->window()->FlashFrame(true); |
2635 modal_browser->window()->Activate(); | 2636 modal_browser->window()->Activate(); |
2636 } | 2637 } |
2637 | 2638 |
2638 AppModalDialogQueue::GetInstance()->ActivateModalDialog(); | 2639 AppModalDialogQueue::GetInstance()->ActivateModalDialog(); |
2639 } | 2640 } |
OLD | NEW |