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

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

Issue 3809005: Moves instant back into flags. (Closed) Base URL: http://git.chromium.org/git/chromium.git
Patch Set: Created 10 years, 2 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/about_flags.cc ('k') | chrome/browser/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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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_BROWSER_H_ 5 #ifndef CHROME_BROWSER_BROWSER_H_
6 #define CHROME_BROWSER_BROWSER_H_ 6 #define CHROME_BROWSER_BROWSER_H_
7 #pragma once 7 #pragma once
8 8
9 #include <map> 9 #include <map>
10 #include <set> 10 #include <set>
(...skipping 1080 matching lines...) Expand 10 before | Expand all | Expand 10 after
1091 1091
1092 // Dialog box used for opening and saving files. 1092 // Dialog box used for opening and saving files.
1093 scoped_refptr<SelectFileDialog> select_file_dialog_; 1093 scoped_refptr<SelectFileDialog> select_file_dialog_;
1094 1094
1095 // Keep track of the encoding auto detect pref. 1095 // Keep track of the encoding auto detect pref.
1096 BooleanPrefMember encoding_auto_detect_; 1096 BooleanPrefMember encoding_auto_detect_;
1097 1097
1098 // Keep track of the printing enabled pref. 1098 // Keep track of the printing enabled pref.
1099 BooleanPrefMember printing_enabled_; 1099 BooleanPrefMember printing_enabled_;
1100 1100
1101 // Keep track of when instant enabled changes.
1102 BooleanPrefMember instant_enabled_;
1103
1104 // Indicates if command execution is blocked. 1101 // Indicates if command execution is blocked.
1105 bool block_command_execution_; 1102 bool block_command_execution_;
1106 1103
1107 // Stores the last blocked command id when |block_command_execution_| is true. 1104 // Stores the last blocked command id when |block_command_execution_| is true.
1108 int last_blocked_command_id_; 1105 int last_blocked_command_id_;
1109 1106
1110 // Stores the disposition type of the last blocked command. 1107 // Stores the disposition type of the last blocked command.
1111 WindowOpenDisposition last_blocked_command_disposition_; 1108 WindowOpenDisposition last_blocked_command_disposition_;
1112 1109
1113 // Different types of action when web app info is available. 1110 // Different types of action when web app info is available.
(...skipping 17 matching lines...) Expand all
1131 // The profile's tab restore service. The service is owned by the profile, 1128 // The profile's tab restore service. The service is owned by the profile,
1132 // and we install ourselves as an observer. 1129 // and we install ourselves as an observer.
1133 TabRestoreService* tab_restore_service_; 1130 TabRestoreService* tab_restore_service_;
1134 1131
1135 scoped_ptr<InstantController> instant_; 1132 scoped_ptr<InstantController> instant_;
1136 1133
1137 DISALLOW_COPY_AND_ASSIGN(Browser); 1134 DISALLOW_COPY_AND_ASSIGN(Browser);
1138 }; 1135 };
1139 1136
1140 #endif // CHROME_BROWSER_BROWSER_H_ 1137 #endif // CHROME_BROWSER_BROWSER_H_
OLDNEW
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/browser/browser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698