commit 2a99a7e74a7f215066514fe81d2bfa6639d9eddd
author Torne (Richard Coles) <torne@google.com> Thu Mar 28 15:31:22 2013 +0000
committer Torne (Richard Coles) <torne@google.com> Thu Mar 28 15:31:22 2013 +0000
tree 7c2d04841fcd599fd83b0f0bb1100e1c89a35bae
parent 61c449bbbb53310a8c041d8cefdd6b01a126cc7e

Merge from Chromium at DEPS revision r190564

This commit was generated by merge_to_master.py.

Change-Id: Icadecbce29854b8fa25fd335b2c1949b5ca5d170

chrome_frame/navigation_constraints.cc

diff --git a/chrome_frame/navigation_constraints.cc b/chrome_frame/navigation_constraints.cc
index 78bd8df..7e999ba 100644
--- a/chrome_frame/navigation_constraints.cc
+++ b/chrome_frame/navigation_constraints.cc
@@ -8,6 +8,7 @@
 #include "base/utf_string_conversions.h"
 #include "chrome/common/url_constants.h"
 #include "chrome_frame/utils.h"
+#include "extensions/common/constants.h"
 
 NavigationConstraintsImpl::NavigationConstraintsImpl() : is_privileged_(false) {
 }
@@ -48,7 +49,7 @@
 
   if (is_privileged_ &&
       (url.SchemeIs(chrome::kDataScheme) ||
-       url.SchemeIs(chrome::kExtensionScheme))) {
+       url.SchemeIs(extensions::kExtensionScheme))) {
     return true;
   }