| 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/callback.h" | 7 #include "base/callback.h" |
| 8 #include "base/memory/ptr_util.h" | 8 #include "base/memory/ptr_util.h" |
| 9 #include "base/time/time.h" | 9 #include "base/time/time.h" |
| 10 #include "build/build_config.h" | 10 #include "build/build_config.h" |
| (...skipping 28 matching lines...) Expand all Loading... |
| 39 #include "ui/views/widget/widget.h" | 39 #include "ui/views/widget/widget.h" |
| 40 #include "ui/views/window/dialog_client_view.h" | 40 #include "ui/views/window/dialog_client_view.h" |
| 41 | 41 |
| 42 #if defined(OS_WIN) | 42 #if defined(OS_WIN) |
| 43 #include "chrome/browser/shell_integration_win.h" | 43 #include "chrome/browser/shell_integration_win.h" |
| 44 #include "ui/base/win/shell.h" | 44 #include "ui/base/win/shell.h" |
| 45 #include "ui/views/win/hwnd_util.h" | 45 #include "ui/views/win/hwnd_util.h" |
| 46 #endif | 46 #endif |
| 47 | 47 |
| 48 #if defined(USE_ASH) | 48 #if defined(USE_ASH) |
| 49 #include "ash/shelf/shelf_util.h" | 49 #include "ash/shelf/shelf_util.h" // nogncheck |
| 50 #include "ash/wm/window_util.h" | 50 #include "ash/wm/window_util.h" // nogncheck |
| 51 #include "grit/ash_resources.h" | 51 #include "grit/ash_resources.h" // nogncheck |
| 52 #endif | 52 #endif |
| 53 | 53 |
| 54 namespace { | 54 namespace { |
| 55 | 55 |
| 56 // An open User Manager window. There can only be one open at a time. This | 56 // An open User Manager window. There can only be one open at a time. This |
| 57 // is reset to NULL when the window is closed. | 57 // is reset to NULL when the window is closed. |
| 58 UserManagerView* instance_ = nullptr; | 58 UserManagerView* instance_ = nullptr; |
| 59 base::Closure* user_manager_shown_callback_for_testing_ = nullptr; | 59 base::Closure* user_manager_shown_callback_for_testing_ = nullptr; |
| 60 bool instance_under_construction_ = false; | 60 bool instance_under_construction_ = false; |
| 61 } // namespace | 61 } // namespace |
| (...skipping 353 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 415 // Now that the window is closed, we can allow a new one to be opened. | 415 // Now that the window is closed, we can allow a new one to be opened. |
| 416 // (WindowClosing comes in asynchronously from the call to Close() and we | 416 // (WindowClosing comes in asynchronously from the call to Close() and we |
| 417 // may have already opened a new instance). | 417 // may have already opened a new instance). |
| 418 if (instance_ == this) | 418 if (instance_ == this) |
| 419 instance_ = NULL; | 419 instance_ = NULL; |
| 420 } | 420 } |
| 421 | 421 |
| 422 bool UserManagerView::ShouldUseCustomFrame() const { | 422 bool UserManagerView::ShouldUseCustomFrame() const { |
| 423 return false; | 423 return false; |
| 424 } | 424 } |
| OLD | NEW |