| OLD | NEW |
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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 <map> | 10 #include <map> |
| (...skipping 599 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 610 } | 610 } |
| 611 | 611 |
| 612 RendererPreferences* GetMutableRendererPrefs() { | 612 RendererPreferences* GetMutableRendererPrefs() { |
| 613 return &renderer_preferences_; | 613 return &renderer_preferences_; |
| 614 } | 614 } |
| 615 | 615 |
| 616 void set_opener_dom_ui_type(DOMUITypeID opener_dom_ui_type) { | 616 void set_opener_dom_ui_type(DOMUITypeID opener_dom_ui_type) { |
| 617 opener_dom_ui_type_ = opener_dom_ui_type; | 617 opener_dom_ui_type_ = opener_dom_ui_type; |
| 618 } | 618 } |
| 619 | 619 |
| 620 // We want to time how long it takes to create a new tab page. This method |
| 621 // gets called as parts of the new tab page have loaded. |
| 622 void LogNewTabTime(const std::string& event_name); |
| 623 |
| 624 // Set the time when we started to create the new tab page. This time is |
| 625 // from before we created this TabContents. |
| 626 void set_new_tab_start_time(const base::TimeTicks& time) { |
| 627 new_tab_start_time_ = time; |
| 628 } |
| 629 |
| 620 private: | 630 private: |
| 621 friend class NavigationController; | 631 friend class NavigationController; |
| 622 // Used to access the child_windows_ (ConstrainedWindowList) for testing | 632 // Used to access the child_windows_ (ConstrainedWindowList) for testing |
| 623 // automation purposes. | 633 // automation purposes. |
| 624 friend class AutomationProvider; | 634 friend class AutomationProvider; |
| 625 friend class BlockedPopupContainerTest; | 635 friend class BlockedPopupContainerTest; |
| 626 friend class BlockedPopupContainerControllerTest; | 636 friend class BlockedPopupContainerControllerTest; |
| 627 | 637 |
| 628 FRIEND_TEST(BlockedPopupContainerTest, TestReposition); | 638 FRIEND_TEST(BlockedPopupContainerTest, TestReposition); |
| 629 FRIEND_TEST(TabContentsTest, NoJSMessageOnInterstitials); | 639 FRIEND_TEST(TabContentsTest, NoJSMessageOnInterstitials); |
| (...skipping 514 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1144 // have never used the monibox for search before. | 1154 // have never used the monibox for search before. |
| 1145 scoped_ptr<OmniboxSearchHint> omnibox_search_hint_; | 1155 scoped_ptr<OmniboxSearchHint> omnibox_search_hint_; |
| 1146 | 1156 |
| 1147 // Settings that get passed to the renderer process. | 1157 // Settings that get passed to the renderer process. |
| 1148 RendererPreferences renderer_preferences_; | 1158 RendererPreferences renderer_preferences_; |
| 1149 | 1159 |
| 1150 // If this tab was created from a renderer using window.open, this will be | 1160 // If this tab was created from a renderer using window.open, this will be |
| 1151 // non-NULL and represent the DOMUI of the opening renderer. | 1161 // non-NULL and represent the DOMUI of the opening renderer. |
| 1152 DOMUITypeID opener_dom_ui_type_; | 1162 DOMUITypeID opener_dom_ui_type_; |
| 1153 | 1163 |
| 1164 // The time that we started to create the new tab page. |
| 1165 base::TimeTicks new_tab_start_time_; |
| 1166 |
| 1154 // --------------------------------------------------------------------------- | 1167 // --------------------------------------------------------------------------- |
| 1155 | 1168 |
| 1156 DISALLOW_COPY_AND_ASSIGN(TabContents); | 1169 DISALLOW_COPY_AND_ASSIGN(TabContents); |
| 1157 }; | 1170 }; |
| 1158 | 1171 |
| 1159 #endif // CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_ | 1172 #endif // CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_ |
| OLD | NEW |