| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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_BROWSER_H_ | 5 #ifndef CHROME_BROWSER_UI_BROWSER_H_ |
| 6 #define CHROME_BROWSER_UI_BROWSER_H_ | 6 #define CHROME_BROWSER_UI_BROWSER_H_ |
| 7 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include <map> | 9 #include <map> |
| 10 #include <set> | 10 #include <set> |
| 11 #include <string> | 11 #include <string> |
| (...skipping 1091 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1103 | 1103 |
| 1104 // Keep track of the printing enabled pref. | 1104 // Keep track of the printing enabled pref. |
| 1105 BooleanPrefMember printing_enabled_; | 1105 BooleanPrefMember printing_enabled_; |
| 1106 | 1106 |
| 1107 // Keep track of the development tools disabled pref. | 1107 // Keep track of the development tools disabled pref. |
| 1108 BooleanPrefMember dev_tools_disabled_; | 1108 BooleanPrefMember dev_tools_disabled_; |
| 1109 | 1109 |
| 1110 // Keep track of when instant enabled changes. | 1110 // Keep track of when instant enabled changes. |
| 1111 BooleanPrefMember instant_enabled_; | 1111 BooleanPrefMember instant_enabled_; |
| 1112 | 1112 |
| 1113 // Tracks the preference that controls whether incognito mode is allowed. |
| 1114 BooleanPrefMember incognito_mode_allowed_; |
| 1115 |
| 1113 // Indicates if command execution is blocked. | 1116 // Indicates if command execution is blocked. |
| 1114 bool block_command_execution_; | 1117 bool block_command_execution_; |
| 1115 | 1118 |
| 1116 // Stores the last blocked command id when |block_command_execution_| is true. | 1119 // Stores the last blocked command id when |block_command_execution_| is true. |
| 1117 int last_blocked_command_id_; | 1120 int last_blocked_command_id_; |
| 1118 | 1121 |
| 1119 // Stores the disposition type of the last blocked command. | 1122 // Stores the disposition type of the last blocked command. |
| 1120 WindowOpenDisposition last_blocked_command_disposition_; | 1123 WindowOpenDisposition last_blocked_command_disposition_; |
| 1121 | 1124 |
| 1122 // Different types of action when web app info is available. | 1125 // Different types of action when web app info is available. |
| (...skipping 15 matching lines...) Expand all Loading... |
| 1138 // and we install ourselves as an observer. | 1141 // and we install ourselves as an observer. |
| 1139 TabRestoreService* tab_restore_service_; | 1142 TabRestoreService* tab_restore_service_; |
| 1140 | 1143 |
| 1141 scoped_ptr<InstantController> instant_; | 1144 scoped_ptr<InstantController> instant_; |
| 1142 scoped_ptr<InstantUnloadHandler> instant_unload_handler_; | 1145 scoped_ptr<InstantUnloadHandler> instant_unload_handler_; |
| 1143 | 1146 |
| 1144 DISALLOW_COPY_AND_ASSIGN(Browser); | 1147 DISALLOW_COPY_AND_ASSIGN(Browser); |
| 1145 }; | 1148 }; |
| 1146 | 1149 |
| 1147 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 1150 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
| OLD | NEW |