| 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 "ash/system/tray/system_tray_widget_delegate.h" | 5 #include "ash/system/tray/system_tray_widget_delegate.h" |
| 6 | 6 |
| 7 #include "ash/ash_export.h" | 7 #include "ash/ash_export.h" |
| 8 #include "ash/focus_cycler.h" | 8 #include "ash/focus_cycler.h" |
| 9 #include "ash/shell.h" | 9 #include "ash/shell.h" |
| 10 #include "ash/shell_window_ids.h" | 10 #include "ash/shell_window_ids.h" |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 60 const FocusCycler* focus_cycler = focus_cycler_for_testing_ ? | 60 const FocusCycler* focus_cycler = focus_cycler_for_testing_ ? |
| 61 focus_cycler_for_testing_ : Shell::GetInstance()->focus_cycler(); | 61 focus_cycler_for_testing_ : Shell::GetInstance()->focus_cycler(); |
| 62 return focus_cycler->widget_activating() == GetWidget(); | 62 return focus_cycler->widget_activating() == GetWidget(); |
| 63 } | 63 } |
| 64 | 64 |
| 65 void StatusAreaView::DeleteDelegate() { | 65 void StatusAreaView::DeleteDelegate() { |
| 66 } | 66 } |
| 67 | 67 |
| 68 } // namespace internal | 68 } // namespace internal |
| 69 } // namespace ash | 69 } // namespace ash |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 10202012:
Revert 133691 because it accidentally reverted revs 133686 and 133684. (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src/