| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 CONTENT_BROWSER_FRAME_HOST_NAVIGATION_ENTRY_IMPL_H_ | 5 #ifndef CONTENT_BROWSER_FRAME_HOST_NAVIGATION_ENTRY_IMPL_H_ |
| 6 #define CONTENT_BROWSER_FRAME_HOST_NAVIGATION_ENTRY_IMPL_H_ | 6 #define CONTENT_BROWSER_FRAME_HOST_NAVIGATION_ENTRY_IMPL_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <map> | 10 #include <map> |
| (...skipping 370 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 381 int frame_tree_node_id() const { | 381 int frame_tree_node_id() const { |
| 382 return frame_tree_node_id_; | 382 return frame_tree_node_id_; |
| 383 } | 383 } |
| 384 void set_frame_tree_node_id(int frame_tree_node_id) { | 384 void set_frame_tree_node_id(int frame_tree_node_id) { |
| 385 frame_tree_node_id_ = frame_tree_node_id; | 385 frame_tree_node_id_ = frame_tree_node_id; |
| 386 } | 386 } |
| 387 | 387 |
| 388 // Returns the history URL for a data URL to use in Blink. | 388 // Returns the history URL for a data URL to use in Blink. |
| 389 GURL GetHistoryURLForDataURL() const; | 389 GURL GetHistoryURLForDataURL() const; |
| 390 | 390 |
| 391 // These flags are set when the navigation controller gets notified of an SSL |
| 392 // error while a navigation is pending. |
| 393 void set_ssl_error(bool error) { ssl_error_ = error; } |
| 394 bool ssl_error() const { return ssl_error_; } |
| 395 |
| 391 #if defined(OS_ANDROID) | 396 #if defined(OS_ANDROID) |
| 392 base::TimeTicks intent_received_timestamp() const { | 397 base::TimeTicks intent_received_timestamp() const { |
| 393 return intent_received_timestamp_; | 398 return intent_received_timestamp_; |
| 394 } | 399 } |
| 395 | 400 |
| 396 void set_intent_received_timestamp( | 401 void set_intent_received_timestamp( |
| 397 const base::TimeTicks intent_received_timestamp) { | 402 const base::TimeTicks intent_received_timestamp) { |
| 398 intent_received_timestamp_ = intent_received_timestamp; | 403 intent_received_timestamp_ = intent_received_timestamp; |
| 399 } | 404 } |
| 400 | 405 |
| (...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 536 ReloadType reload_type_; | 541 ReloadType reload_type_; |
| 537 | 542 |
| 538 // Determine if the navigation was started within a context menu. | 543 // Determine if the navigation was started within a context menu. |
| 539 bool started_from_context_menu_; | 544 bool started_from_context_menu_; |
| 540 | 545 |
| 541 // Used to store extra data to support browser features. This member is not | 546 // Used to store extra data to support browser features. This member is not |
| 542 // persisted, unless specific data is taken out/put back in at save/restore | 547 // persisted, unless specific data is taken out/put back in at save/restore |
| 543 // time (see TabNavigation for an example of this). | 548 // time (see TabNavigation for an example of this). |
| 544 std::map<std::string, base::string16> extra_data_; | 549 std::map<std::string, base::string16> extra_data_; |
| 545 | 550 |
| 551 // Set to true if the navigation controller gets notified about a SSL error |
| 552 // for a pending navigation. Defaults to false. |
| 553 bool ssl_error_; |
| 554 |
| 546 DISALLOW_COPY_AND_ASSIGN(NavigationEntryImpl); | 555 DISALLOW_COPY_AND_ASSIGN(NavigationEntryImpl); |
| 547 }; | 556 }; |
| 548 | 557 |
| 549 } // namespace content | 558 } // namespace content |
| 550 | 559 |
| 551 #endif // CONTENT_BROWSER_FRAME_HOST_NAVIGATION_ENTRY_IMPL_H_ | 560 #endif // CONTENT_BROWSER_FRAME_HOST_NAVIGATION_ENTRY_IMPL_H_ |
| OLD | NEW |