| 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 #ifndef CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_ | 5 #ifndef CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_ |
| 6 #define CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_ | 6 #define CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "ash/shelf/shelf_item_types.h" | 10 #include "ash/shelf/shelf_item_types.h" |
| (...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 89 | 89 |
| 90 content::NotificationRegistrar registrar_; | 90 content::NotificationRegistrar registrar_; |
| 91 | 91 |
| 92 ChromeLauncherController* shelf_delegate_; | 92 ChromeLauncherController* shelf_delegate_; |
| 93 | 93 |
| 94 ObserverList<ash::VirtualKeyboardStateObserver> keyboard_state_observer_list_; | 94 ObserverList<ash::VirtualKeyboardStateObserver> keyboard_state_observer_list_; |
| 95 | 95 |
| 96 #if defined(OS_CHROMEOS) | 96 #if defined(OS_CHROMEOS) |
| 97 scoped_ptr<chromeos::DisplayConfigurationObserver> | 97 scoped_ptr<chromeos::DisplayConfigurationObserver> |
| 98 display_configuration_observer_; | 98 display_configuration_observer_; |
| 99 bool is_first_run_; |
| 99 #endif | 100 #endif |
| 100 | 101 |
| 101 DISALLOW_COPY_AND_ASSIGN(ChromeShellDelegate); | 102 DISALLOW_COPY_AND_ASSIGN(ChromeShellDelegate); |
| 102 }; | 103 }; |
| 103 | 104 |
| 104 #endif // CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_ | 105 #endif // CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_ |
| OLD | NEW |