OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/profiles/user_manager_view.h" | 5 #include "chrome/browser/ui/views/profiles/user_manager_view.h" |
6 | 6 |
7 #include "base/memory/scoped_ptr.h" | 7 #include "base/memory/scoped_ptr.h" |
8 #include "base/time/time.h" | 8 #include "base/time/time.h" |
9 #include "chrome/browser/browser_process.h" | 9 #include "chrome/browser/browser_process.h" |
10 #include "chrome/browser/lifetime/application_lifetime.h" | 10 #include "chrome/browser/lifetime/application_lifetime.h" |
11 #include "chrome/browser/profiles/profile_avatar_icon_util.h" | 11 #include "chrome/browser/profiles/profile_avatar_icon_util.h" |
12 #include "chrome/browser/profiles/profile_manager.h" | 12 #include "chrome/browser/profiles/profile_manager.h" |
13 #include "chrome/browser/profiles/profile_metrics.h" | 13 #include "chrome/browser/profiles/profile_metrics.h" |
14 #include "chrome/browser/profiles/profile_window.h" | 14 #include "chrome/browser/profiles/profile_window.h" |
15 #include "chrome/browser/profiles/profiles_state.h" | 15 #include "chrome/browser/profiles/profiles_state.h" |
16 #include "chrome/browser/signin/signin_promo.h" | 16 #include "chrome/browser/signin/signin_promo.h" |
17 #include "chrome/browser/ui/browser.h" | 17 #include "chrome/browser/ui/browser.h" |
18 #include "chrome/browser/ui/browser_dialogs.h" | 18 #include "chrome/browser/ui/browser_dialogs.h" |
19 #include "chrome/browser/ui/browser_finder.h" | 19 #include "chrome/browser/ui/browser_finder.h" |
20 #include "chrome/browser/ui/browser_window.h" | 20 #include "chrome/browser/ui/browser_window.h" |
| 21 #include "chrome/browser/ui/host_desktop.h" |
21 #include "chrome/browser/ui/user_manager.h" | 22 #include "chrome/browser/ui/user_manager.h" |
22 #include "chrome/browser/ui/views/auto_keep_alive.h" | 23 #include "chrome/browser/ui/views/auto_keep_alive.h" |
23 #include "chrome/browser/ui/views/browser_dialogs.h" | 24 #include "chrome/browser/ui/views/browser_dialogs.h" |
24 #include "chrome/grit/chromium_strings.h" | 25 #include "chrome/grit/chromium_strings.h" |
25 #include "chrome/grit/generated_resources.h" | 26 #include "chrome/grit/generated_resources.h" |
26 #include "components/guest_view/browser/guest_view_manager.h" | 27 #include "components/guest_view/browser/guest_view_manager.h" |
27 #include "content/public/browser/navigation_details.h" | 28 #include "content/public/browser/navigation_details.h" |
28 #include "content/public/browser/render_widget_host_view.h" | 29 #include "content/public/browser/render_widget_host_view.h" |
29 #include "content/public/browser/web_contents.h" | 30 #include "content/public/browser/web_contents.h" |
30 #include "google_apis/gaia/gaia_urls.h" | 31 #include "google_apis/gaia/gaia_urls.h" |
(...skipping 336 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
367 // Now that the window is closed, we can allow a new one to be opened. | 368 // Now that the window is closed, we can allow a new one to be opened. |
368 // (WindowClosing comes in asynchronously from the call to Close() and we | 369 // (WindowClosing comes in asynchronously from the call to Close() and we |
369 // may have already opened a new instance). | 370 // may have already opened a new instance). |
370 if (instance_ == this) | 371 if (instance_ == this) |
371 instance_ = NULL; | 372 instance_ = NULL; |
372 } | 373 } |
373 | 374 |
374 bool UserManagerView::UseNewStyleForThisDialog() const { | 375 bool UserManagerView::UseNewStyleForThisDialog() const { |
375 return false; | 376 return false; |
376 } | 377 } |
OLD | NEW |