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

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

Issue 2067003: Track "display" and "run" separately for mixed content, and make the latter d... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years, 7 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
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_TAB_CONTENTS_TAB_CONTENTS_H_ 5 #ifndef CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_
6 #define CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_ 6 #define CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_
7 7
8 #include "build/build_config.h" 8 #include "build/build_config.h"
9 9
10 #include <deque> 10 #include <deque>
(...skipping 280 matching lines...) Expand 10 before | Expand all | Expand 10 after
291 const webkit_glue::WebApplicationInfo& web_app_info() const { 291 const webkit_glue::WebApplicationInfo& web_app_info() const {
292 return web_app_info_; 292 return web_app_info_;
293 } 293 }
294 294
295 const SkBitmap& app_icon() const { return app_icon_; } 295 const SkBitmap& app_icon() const { return app_icon_; }
296 296
297 // Sets an app icon associated with TabContents and fires an INVALIDATE_TITLE 297 // Sets an app icon associated with TabContents and fires an INVALIDATE_TITLE
298 // navigation state change to trigger repaint of title. 298 // navigation state change to trigger repaint of title.
299 void SetAppIcon(const SkBitmap& app_icon); 299 void SetAppIcon(const SkBitmap& app_icon);
300 300
301 bool displayed_insecure_content() const {
302 return displayed_insecure_content_;
303 }
304
301 // Internal state ------------------------------------------------------------ 305 // Internal state ------------------------------------------------------------
302 306
303 // This flag indicates whether the tab contents is currently being 307 // This flag indicates whether the tab contents is currently being
304 // screenshotted by the DraggedTabController. 308 // screenshotted by the DraggedTabController.
305 bool capturing_contents() const { return capturing_contents_; } 309 bool capturing_contents() const { return capturing_contents_; }
306 void set_capturing_contents(bool cap) { capturing_contents_ = cap; } 310 void set_capturing_contents(bool cap) { capturing_contents_ = cap; }
307 311
308 // Indicates whether this tab should be considered crashed. The setter will 312 // Indicates whether this tab should be considered crashed. The setter will
309 // also notify the delegate when the flag is changed. 313 // also notify the delegate when the flag is changed.
310 bool is_crashed() const { return is_crashed_; } 314 bool is_crashed() const { return is_crashed_; }
(...skipping 817 matching lines...) Expand 10 before | Expand all | Expand 10 after
1128 1132
1129 // Object that holds any blocked popups frmo the current page. 1133 // Object that holds any blocked popups frmo the current page.
1130 BlockedPopupContainer* blocked_popups_; 1134 BlockedPopupContainer* blocked_popups_;
1131 1135
1132 // TODO(pkasting): Hack to try and fix Linux browser tests. 1136 // TODO(pkasting): Hack to try and fix Linux browser tests.
1133 bool dont_notify_render_view_; 1137 bool dont_notify_render_view_;
1134 1138
1135 // Stores which content setting types actually have blocked content. 1139 // Stores which content setting types actually have blocked content.
1136 bool content_blocked_[CONTENT_SETTINGS_NUM_TYPES]; 1140 bool content_blocked_[CONTENT_SETTINGS_NUM_TYPES];
1137 1141
1142 // True if this is a secure page which displayed insecure content.
1143 bool displayed_insecure_content_;
1144
1138 // Data for shelves and stuff ------------------------------------------------ 1145 // Data for shelves and stuff ------------------------------------------------
1139 1146
1140 // Delegates for InfoBars associated with this TabContents. 1147 // Delegates for InfoBars associated with this TabContents.
1141 std::vector<InfoBarDelegate*> infobar_delegates_; 1148 std::vector<InfoBarDelegate*> infobar_delegates_;
1142 1149
1143 // Data for find in page ----------------------------------------------------- 1150 // Data for find in page -----------------------------------------------------
1144 1151
1145 // TODO(brettw) this should be separated into a helper class. 1152 // TODO(brettw) this should be separated into a helper class.
1146 1153
1147 // Each time a search request comes in we assign it an id before passing it 1154 // Each time a search request comes in we assign it an id before passing it
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
1268 // Keep track of if we've already requested the accessibility tree so 1275 // Keep track of if we've already requested the accessibility tree so
1269 // we don't do it more than once. 1276 // we don't do it more than once.
1270 bool requested_accessibility_tree_; 1277 bool requested_accessibility_tree_;
1271 1278
1272 // --------------------------------------------------------------------------- 1279 // ---------------------------------------------------------------------------
1273 1280
1274 DISALLOW_COPY_AND_ASSIGN(TabContents); 1281 DISALLOW_COPY_AND_ASSIGN(TabContents);
1275 }; 1282 };
1276 1283
1277 #endif // CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_ 1284 #endif // CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698