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

Side by Side Diff: chrome/browser/extensions/api/web_navigation/frame_navigation_state.cc

Issue 254763005: Move some content url constants to /url. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update url/BUILD.gn and address some style nits. Created 6 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
OLDNEW
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 "url/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,
18 content::kHttpScheme, 19 url::kHttpScheme,
19 content::kHttpsScheme, 20 url::kHttpsScheme,
20 content::kFileScheme, 21 content::kFileScheme,
21 content::kFtpScheme, 22 content::kFtpScheme,
22 content::kJavaScriptScheme, 23 content::kJavaScriptScheme,
23 content::kDataScheme, 24 content::kDataScheme,
24 content::kFileSystemScheme, 25 content::kFileSystemScheme,
25 }; 26 };
26 27
27 } // namespace 28 } // namespace
28 29
29 FrameNavigationState::FrameID::FrameID() 30 FrameNavigationState::FrameID::FrameID()
30 : frame_num(-1), 31 : frame_num(-1),
31 render_view_host(NULL) { 32 render_view_host(NULL) {
32 } 33 }
33 34
34 FrameNavigationState::FrameID::FrameID( 35 FrameNavigationState::FrameID::FrameID(
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after
262 } 263 }
263 264
264 bool FrameNavigationState::GetIsServerRedirected(FrameID frame_id) const { 265 bool FrameNavigationState::GetIsServerRedirected(FrameID frame_id) const {
265 FrameIdToStateMap::const_iterator frame_state = 266 FrameIdToStateMap::const_iterator frame_state =
266 frame_state_map_.find(frame_id); 267 frame_state_map_.find(frame_id);
267 return (frame_state != frame_state_map_.end() && 268 return (frame_state != frame_state_map_.end() &&
268 frame_state->second.is_server_redirected); 269 frame_state->second.is_server_redirected);
269 } 270 }
270 271
271 } // namespace extensions 272 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698