diff options
| -rw-r--r-- | chrome/utility/DEPS | 1 | ||||
| -rw-r--r-- | chrome/utility/chrome_content_utility_client.h | 2 | ||||
| -rw-r--r-- | content/content_utility.gypi | 2 | ||||
| -rw-r--r-- | content/public/utility/content_utility_client.h (renamed from content/utility/content_utility_client.h) | 6 | ||||
| -rw-r--r-- | content/shell/shell_content_utility_client.h | 2 | ||||
| -rw-r--r-- | content/utility/DEPS | 1 | ||||
| -rw-r--r-- | content/utility/utility_thread.cc | 2 |
7 files changed, 9 insertions, 7 deletions
diff --git a/chrome/utility/DEPS b/chrome/utility/DEPS index 0a16cec..4cc342b 100644 --- a/chrome/utility/DEPS +++ b/chrome/utility/DEPS @@ -1,5 +1,6 @@ include_rules = [ "+chrome/browser", # For out of process profile import. + "+content/public/utility", "+content/utility", "+webkit/glue", ] diff --git a/chrome/utility/chrome_content_utility_client.h b/chrome/utility/chrome_content_utility_client.h index 005fd5e..fa419e0 100644 --- a/chrome/utility/chrome_content_utility_client.h +++ b/chrome/utility/chrome_content_utility_client.h @@ -10,7 +10,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/platform_file.h" -#include "content/utility/content_utility_client.h" +#include "content/public/utility/content_utility_client.h" #include "printing/pdf_render_settings.h" class ExternalProcessImporterBridge; diff --git a/content/content_utility.gypi b/content/content_utility.gypi index d60e016..2656633 100644 --- a/content/content_utility.gypi +++ b/content/content_utility.gypi @@ -7,7 +7,7 @@ '../base/base.gyp:base', ], 'sources': [ - 'utility/content_utility_client.h', + 'public/utility/content_utility_client.h', 'utility/utility_main.cc', 'utility/utility_thread.cc', 'utility/utility_thread.h', diff --git a/content/utility/content_utility_client.h b/content/public/utility/content_utility_client.h index 6a4b3ea..6ed09b4 100644 --- a/content/utility/content_utility_client.h +++ b/content/public/utility/content_utility_client.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CONTENT_UTILITY_CONTENT_UTILITY_CLIENT_H_ -#define CONTENT_UTILITY_CONTENT_UTILITY_CLIENT_H_ +#ifndef CONTENT_PUBLIC_UTILITY_CONTENT_UTILITY_CLIENT_H_ +#define CONTENT_PUBLIC_UTILITY_CONTENT_UTILITY_CLIENT_H_ #pragma once #include "content/common/content_client.h" @@ -22,4 +22,4 @@ class ContentUtilityClient { } // namespace content -#endif // CONTENT_UTILITY_CONTENT_UTILITY_CLIENT_H_ +#endif // CONTENT_PUBLIC_UTILITY_CONTENT_UTILITY_CLIENT_H_ diff --git a/content/shell/shell_content_utility_client.h b/content/shell/shell_content_utility_client.h index 287a79f..051298a 100644 --- a/content/shell/shell_content_utility_client.h +++ b/content/shell/shell_content_utility_client.h @@ -7,7 +7,7 @@ #pragma once #include "base/compiler_specific.h" -#include "content/utility/content_utility_client.h" +#include "content/public/utility/content_utility_client.h" namespace content { diff --git a/content/utility/DEPS b/content/utility/DEPS index 96944f28..bdee969 100644 --- a/content/utility/DEPS +++ b/content/utility/DEPS @@ -1,4 +1,5 @@ include_rules = [ + "+content/public/utility", "+sandbox/src", "+webkit/glue", ] diff --git a/content/utility/utility_thread.cc b/content/utility/utility_thread.cc index a642ea1..607ec53 100644 --- a/content/utility/utility_thread.cc +++ b/content/utility/utility_thread.cc @@ -10,7 +10,7 @@ #include "content/common/child_process.h" #include "content/common/indexed_db_key.h" #include "content/common/utility_messages.h" -#include "content/utility/content_utility_client.h" +#include "content/public/utility/content_utility_client.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBKey.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebSerializedScriptValue.h" |