OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/extensions/api/web_navigation/frame_navigation_state.h" | 5 #include "chrome/browser/extensions/api/web_navigation/frame_navigation_state.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "chrome/common/url_constants.h" | 8 #include "chrome/common/url_constants.h" |
9 #include "extensions/common/constants.h" | 9 #include "extensions/common/constants.h" |
10 #include "net/base/url_constants.h" | |
10 | 11 |
11 namespace extensions { | 12 namespace extensions { |
12 | 13 |
13 namespace { | 14 namespace { |
14 | 15 |
15 // URL schemes for which we'll send events. | 16 // URL schemes for which we'll send events. |
16 const char* kValidSchemes[] = { | 17 const char* kValidSchemes[] = { |
17 content::kChromeUIScheme, | 18 content::kChromeUIScheme, net::kHttpScheme, |
blundell
2014/04/28 09:11:17
nit: I prefer the formatting as it was previously.
Sungmann Cho
2014/04/29 04:50:30
Done.
| |
18 content::kHttpScheme, | 19 net::kHttpsScheme, content::kFileScheme, |
19 content::kHttpsScheme, | 20 content::kFtpScheme, content::kJavaScriptScheme, |
20 content::kFileScheme, | 21 content::kDataScheme, content::kFileSystemScheme, |
21 content::kFtpScheme, | |
22 content::kJavaScriptScheme, | |
23 content::kDataScheme, | |
24 content::kFileSystemScheme, | |
25 }; | 22 }; |
26 | 23 |
27 } // namespace | 24 } // namespace |
28 | 25 |
29 FrameNavigationState::FrameID::FrameID() | 26 FrameNavigationState::FrameID::FrameID() |
30 : frame_num(-1), | 27 : frame_num(-1), |
31 render_view_host(NULL) { | 28 render_view_host(NULL) { |
32 } | 29 } |
33 | 30 |
34 FrameNavigationState::FrameID::FrameID( | 31 FrameNavigationState::FrameID::FrameID( |
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
262 } | 259 } |
263 | 260 |
264 bool FrameNavigationState::GetIsServerRedirected(FrameID frame_id) const { | 261 bool FrameNavigationState::GetIsServerRedirected(FrameID frame_id) const { |
265 FrameIdToStateMap::const_iterator frame_state = | 262 FrameIdToStateMap::const_iterator frame_state = |
266 frame_state_map_.find(frame_id); | 263 frame_state_map_.find(frame_id); |
267 return (frame_state != frame_state_map_.end() && | 264 return (frame_state != frame_state_map_.end() && |
268 frame_state->second.is_server_redirected); | 265 frame_state->second.is_server_redirected); |
269 } | 266 } |
270 | 267 |
271 } // namespace extensions | 268 } // namespace extensions |
OLD | NEW |