Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(204)

Side by Side Diff: chrome/browser/ui/browser.h

Issue 6399001: Revert 72624 (due to crashes) - Implement pref policy for disabling incognito... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/tab_contents/render_view_context_menu.cc ('k') | chrome/browser/ui/browser.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 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>
(...skipping 1094 matching lines...) Expand 10 before | Expand all | Expand 10 after
1105 1105
1106 // Keep track of the printing enabled pref. 1106 // Keep track of the printing enabled pref.
1107 BooleanPrefMember printing_enabled_; 1107 BooleanPrefMember printing_enabled_;
1108 1108
1109 // Keep track of the development tools disabled pref. 1109 // Keep track of the development tools disabled pref.
1110 BooleanPrefMember dev_tools_disabled_; 1110 BooleanPrefMember dev_tools_disabled_;
1111 1111
1112 // Keep track of when instant enabled changes. 1112 // Keep track of when instant enabled changes.
1113 BooleanPrefMember instant_enabled_; 1113 BooleanPrefMember instant_enabled_;
1114 1114
1115 // Tracks the preference that controls whether incognito mode is allowed.
1116 BooleanPrefMember incognito_mode_allowed_;
1117
1118 // Indicates if command execution is blocked. 1115 // Indicates if command execution is blocked.
1119 bool block_command_execution_; 1116 bool block_command_execution_;
1120 1117
1121 // Stores the last blocked command id when |block_command_execution_| is true. 1118 // Stores the last blocked command id when |block_command_execution_| is true.
1122 int last_blocked_command_id_; 1119 int last_blocked_command_id_;
1123 1120
1124 // Stores the disposition type of the last blocked command. 1121 // Stores the disposition type of the last blocked command.
1125 WindowOpenDisposition last_blocked_command_disposition_; 1122 WindowOpenDisposition last_blocked_command_disposition_;
1126 1123
1127 // Different types of action when web app info is available. 1124 // Different types of action when web app info is available.
(...skipping 15 matching lines...) Expand all
1143 // and we install ourselves as an observer. 1140 // and we install ourselves as an observer.
1144 TabRestoreService* tab_restore_service_; 1141 TabRestoreService* tab_restore_service_;
1145 1142
1146 scoped_ptr<InstantController> instant_; 1143 scoped_ptr<InstantController> instant_;
1147 scoped_ptr<InstantUnloadHandler> instant_unload_handler_; 1144 scoped_ptr<InstantUnloadHandler> instant_unload_handler_;
1148 1145
1149 DISALLOW_COPY_AND_ASSIGN(Browser); 1146 DISALLOW_COPY_AND_ASSIGN(Browser);
1150 }; 1147 };
1151 1148
1152 #endif // CHROME_BROWSER_UI_BROWSER_H_ 1149 #endif // CHROME_BROWSER_UI_BROWSER_H_
OLDNEW
« no previous file with comments | « chrome/browser/tab_contents/render_view_context_menu.cc ('k') | chrome/browser/ui/browser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698