| 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 "chrome/browser/browser_process.h" | 7 #include "chrome/browser/browser_process.h" |
| 8 #include "chrome/browser/lifetime/application_lifetime.h" | 8 #include "chrome/browser/lifetime/application_lifetime.h" |
| 9 #include "chrome/browser/profiles/profile_manager.h" | 9 #include "chrome/browser/profiles/profile_manager.h" |
| 10 #include "chrome/browser/profiles/profile_metrics.h" | 10 #include "chrome/browser/profiles/profile_metrics.h" |
| (...skipping 12 matching lines...) Expand all Loading... |
| 23 #include "ui/views/widget/widget.h" | 23 #include "ui/views/widget/widget.h" |
| 24 | 24 |
| 25 #if defined(USE_ASH) | 25 #if defined(USE_ASH) |
| 26 #include "ash/wm/window_util.h" | 26 #include "ash/wm/window_util.h" |
| 27 #endif | 27 #endif |
| 28 | 28 |
| 29 #if defined(OS_WIN) | 29 #if defined(OS_WIN) |
| 30 #include "chrome/browser/shell_integration.h" | 30 #include "chrome/browser/shell_integration.h" |
| 31 #include "ui/base/win/shell.h" | 31 #include "ui/base/win/shell.h" |
| 32 #include "ui/views/win/hwnd_util.h" | 32 #include "ui/views/win/hwnd_util.h" |
| 33 #include "win8/util/win8_util.h" | |
| 34 #endif | 33 #endif |
| 35 | 34 |
| 36 namespace { | 35 namespace { |
| 37 | 36 |
| 38 // Default window size. | 37 // Default window size. |
| 39 const int kWindowWidth = 900; | 38 const int kWindowWidth = 900; |
| 40 const int kWindowHeight = 700; | 39 const int kWindowHeight = 700; |
| 41 | 40 |
| 42 } | 41 } |
| 43 | 42 |
| (...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 146 // Now that the window is closed, we can allow a new one to be opened. | 145 // Now that the window is closed, we can allow a new one to be opened. |
| 147 // (WindowClosing comes in asynchronously from the call to Close() and we | 146 // (WindowClosing comes in asynchronously from the call to Close() and we |
| 148 // may have already opened a new instance). | 147 // may have already opened a new instance). |
| 149 if (instance_ == this) | 148 if (instance_ == this) |
| 150 instance_ = NULL; | 149 instance_ = NULL; |
| 151 } | 150 } |
| 152 | 151 |
| 153 bool UserManagerView::UseNewStyleForThisDialog() const { | 152 bool UserManagerView::UseNewStyleForThisDialog() const { |
| 154 return false; | 153 return false; |
| 155 } | 154 } |
| OLD | NEW |