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 #include "chrome/browser/tab_contents/navigation_controller.h" | 5 #include "chrome/browser/tab_contents/navigation_controller.h" |
6 | 6 |
7 #include "base/file_util.h" | 7 #include "base/file_util.h" |
8 #include "base/logging.h" | 8 #include "base/logging.h" |
9 #include "base/string_util.h" | 9 #include "base/string_util.h" |
10 #include "base/time.h" | 10 #include "base/time.h" |
(...skipping 18 matching lines...) Expand all Loading... |
29 #include "chrome/common/url_constants.h" | 29 #include "chrome/common/url_constants.h" |
30 #include "grit/app_resources.h" | 30 #include "grit/app_resources.h" |
31 #include "net/base/escape.h" | 31 #include "net/base/escape.h" |
32 #include "net/base/net_util.h" | 32 #include "net/base/net_util.h" |
33 #include "net/base/mime_util.h" | 33 #include "net/base/mime_util.h" |
34 #include "webkit/glue/webkit_glue.h" | 34 #include "webkit/glue/webkit_glue.h" |
35 | 35 |
36 namespace { | 36 namespace { |
37 | 37 |
38 const int kInvalidateAllButShelves = | 38 const int kInvalidateAllButShelves = |
39 0xFFFFFFFF & ~(TabContents::INVALIDATE_BOOKMARK_BAR | | 39 0xFFFFFFFF & ~TabContents::INVALIDATE_BOOKMARK_BAR; |
40 TabContents::INVALIDATE_EXTENSION_SHELF); | |
41 | 40 |
42 // Invoked when entries have been pruned, or removed. For example, if the | 41 // Invoked when entries have been pruned, or removed. For example, if the |
43 // current entries are [google, digg, yahoo], with the current entry google, | 42 // current entries are [google, digg, yahoo], with the current entry google, |
44 // and the user types in cnet, then digg and yahoo are pruned. | 43 // and the user types in cnet, then digg and yahoo are pruned. |
45 void NotifyPrunedEntries(NavigationController* nav_controller, | 44 void NotifyPrunedEntries(NavigationController* nav_controller, |
46 bool from_front, | 45 bool from_front, |
47 int count) { | 46 int count) { |
48 NavigationController::PrunedDetails details; | 47 NavigationController::PrunedDetails details; |
49 details.from_front = from_front; | 48 details.from_front = from_front; |
50 details.count = count; | 49 details.count = count; |
(...skipping 1088 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1139 return i; | 1138 return i; |
1140 } | 1139 } |
1141 return -1; | 1140 return -1; |
1142 } | 1141 } |
1143 | 1142 |
1144 NavigationEntry* NavigationController::GetTransientEntry() const { | 1143 NavigationEntry* NavigationController::GetTransientEntry() const { |
1145 if (transient_entry_index_ == -1) | 1144 if (transient_entry_index_ == -1) |
1146 return NULL; | 1145 return NULL; |
1147 return entries_[transient_entry_index_].get(); | 1146 return entries_[transient_entry_index_].get(); |
1148 } | 1147 } |
OLD | NEW |