Commit 5cf0a37c authored by hanxi@chromium.org's avatar hanxi@chromium.org

Move constants in guest view to extensions.

BUG=352290

Review URL: https://codereview.chromium.org/449203002

Cr-Commit-Position: refs/heads/master@{#288507}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@288507 0039d316-1c4b-4281-b951-d872f2087c98
parent f144dfee
...@@ -223,11 +223,11 @@ ...@@ -223,11 +223,11 @@
#include "chrome/browser/extensions/extension_util.h" #include "chrome/browser/extensions/extension_util.h"
#include "chrome/browser/extensions/suggest_permission_util.h" #include "chrome/browser/extensions/suggest_permission_util.h"
#include "chrome/browser/guest_view/guest_view_base.h" #include "chrome/browser/guest_view/guest_view_base.h"
#include "chrome/browser/guest_view/guest_view_constants.h"
#include "chrome/browser/guest_view/guest_view_manager.h" #include "chrome/browser/guest_view/guest_view_manager.h"
#include "chrome/browser/guest_view/web_view/web_view_guest.h" #include "chrome/browser/guest_view/web_view/web_view_guest.h"
#include "chrome/browser/guest_view/web_view/web_view_permission_helper.h" #include "chrome/browser/guest_view/web_view/web_view_permission_helper.h"
#include "chrome/browser/guest_view/web_view/web_view_renderer_state.h" #include "chrome/browser/guest_view/web_view/web_view_renderer_state.h"
#include "extensions/browser/guest_view/guest_view_constants.h"
#include "extensions/common/manifest_handlers/background_info.h" #include "extensions/common/manifest_handlers/background_info.h"
#endif #endif
......
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
#include "base/lazy_instance.h" #include "base/lazy_instance.h"
#include "base/strings/utf_string_conversions.h" #include "base/strings/utf_string_conversions.h"
#include "chrome/browser/guest_view/guest_view_constants.h"
#include "chrome/browser/guest_view/guest_view_manager.h" #include "chrome/browser/guest_view/guest_view_manager.h"
#include "content/public/browser/render_frame_host.h" #include "content/public/browser/render_frame_host.h"
#include "content/public/browser/render_process_host.h" #include "content/public/browser/render_process_host.h"
...@@ -16,6 +15,7 @@ ...@@ -16,6 +15,7 @@
#include "extensions/browser/api/extensions_api_client.h" #include "extensions/browser/api/extensions_api_client.h"
#include "extensions/browser/event_router.h" #include "extensions/browser/event_router.h"
#include "extensions/browser/extension_registry.h" #include "extensions/browser/extension_registry.h"
#include "extensions/browser/guest_view/guest_view_constants.h"
#include "extensions/browser/process_map.h" #include "extensions/browser/process_map.h"
#include "extensions/common/features/feature.h" #include "extensions/common/features/feature.h"
#include "extensions/common/features/feature_provider.h" #include "extensions/common/features/feature_provider.h"
......
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
#include "base/strings/stringprintf.h" #include "base/strings/stringprintf.h"
#include "chrome/browser/guest_view/guest_view_base.h" #include "chrome/browser/guest_view/guest_view_base.h"
#include "chrome/browser/guest_view/guest_view_constants.h"
#include "chrome/browser/guest_view/guest_view_manager_factory.h" #include "chrome/browser/guest_view/guest_view_manager_factory.h"
#include "content/public/browser/browser_context.h" #include "content/public/browser/browser_context.h"
#include "content/public/browser/render_process_host.h" #include "content/public/browser/render_process_host.h"
...@@ -15,6 +14,7 @@ ...@@ -15,6 +14,7 @@
#include "content/public/common/result_codes.h" #include "content/public/common/result_codes.h"
#include "content/public/common/url_constants.h" #include "content/public/common/url_constants.h"
#include "extensions/browser/extension_system.h" #include "extensions/browser/extension_system.h"
#include "extensions/browser/guest_view/guest_view_constants.h"
#include "net/base/escape.h" #include "net/base/escape.h"
#include "url/gurl.h" #include "url/gurl.h"
......
...@@ -6,11 +6,11 @@ ...@@ -6,11 +6,11 @@
#include "base/strings/utf_string_conversions.h" #include "base/strings/utf_string_conversions.h"
#include "base/values.h" #include "base/values.h"
#include "chrome/browser/guest_view/guest_view_constants.h"
#include "chrome/browser/guest_view/web_view/web_view_constants.h" #include "chrome/browser/guest_view/web_view/web_view_constants.h"
#include "chrome/browser/guest_view/web_view/web_view_guest.h" #include "chrome/browser/guest_view/web_view/web_view_guest.h"
#include "chrome/browser/guest_view/web_view/web_view_permission_helper.h" #include "chrome/browser/guest_view/web_view/web_view_permission_helper.h"
#include "chrome/browser/guest_view/web_view/web_view_permission_types.h" #include "chrome/browser/guest_view/web_view/web_view_permission_types.h"
#include "extensions/browser/guest_view/guest_view_constants.h"
namespace { namespace {
......
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
#include "chrome/browser/extensions/menu_manager.h" #include "chrome/browser/extensions/menu_manager.h"
#include "chrome/browser/extensions/script_executor.h" #include "chrome/browser/extensions/script_executor.h"
#include "chrome/browser/favicon/favicon_tab_helper.h" #include "chrome/browser/favicon/favicon_tab_helper.h"
#include "chrome/browser/guest_view/guest_view_constants.h"
#include "chrome/browser/guest_view/guest_view_manager.h" #include "chrome/browser/guest_view/guest_view_manager.h"
#include "chrome/browser/guest_view/web_view/web_view_constants.h" #include "chrome/browser/guest_view/web_view/web_view_constants.h"
#include "chrome/browser/guest_view/web_view/web_view_permission_helper.h" #include "chrome/browser/guest_view/web_view/web_view_permission_helper.h"
...@@ -49,6 +48,7 @@ ...@@ -49,6 +48,7 @@
#include "content/public/common/stop_find_action.h" #include "content/public/common/stop_find_action.h"
#include "content/public/common/url_constants.h" #include "content/public/common/url_constants.h"
#include "extensions/browser/extension_system.h" #include "extensions/browser/extension_system.h"
#include "extensions/browser/guest_view/guest_view_constants.h"
#include "extensions/common/constants.h" #include "extensions/common/constants.h"
#include "ipc/ipc_message_macros.h" #include "ipc/ipc_message_macros.h"
#include "net/base/escape.h" #include "net/base/escape.h"
......
...@@ -7,11 +7,11 @@ ...@@ -7,11 +7,11 @@
#include "base/memory/weak_ptr.h" #include "base/memory/weak_ptr.h"
#include "base/metrics/user_metrics_action.h" #include "base/metrics/user_metrics_action.h"
#include "chrome/browser/guest_view/guest_view_constants.h"
#include "chrome/browser/guest_view/web_view/web_view_permission_types.h" #include "chrome/browser/guest_view/web_view/web_view_permission_types.h"
#include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents.h"
#include "content/public/browser/web_contents_observer.h" #include "content/public/browser/web_contents_observer.h"
#include "content/public/common/media_stream_request.h" #include "content/public/common/media_stream_request.h"
#include "extensions/browser/guest_view/guest_view_constants.h"
using base::UserMetricsAction; using base::UserMetricsAction;
......
...@@ -1504,8 +1504,6 @@ ...@@ -1504,8 +1504,6 @@
'browser/guest_view/extension_options/extension_options_constants.h', 'browser/guest_view/extension_options/extension_options_constants.h',
'browser/guest_view/extension_options/extension_options_guest.cc', 'browser/guest_view/extension_options/extension_options_guest.cc',
'browser/guest_view/extension_options/extension_options_guest.h', 'browser/guest_view/extension_options/extension_options_guest.h',
'browser/guest_view/guest_view_constants.cc',
'browser/guest_view/guest_view_constants.h',
'browser/guest_view/guest_view_base.cc', 'browser/guest_view/guest_view_base.cc',
'browser/guest_view/guest_view_base.h', 'browser/guest_view/guest_view_base.h',
'browser/guest_view/guest_view_manager_factory.h', 'browser/guest_view/guest_view_manager_factory.h',
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "chrome/browser/guest_view/guest_view_constants.h" #include "extensions/browser/guest_view/guest_view_constants.h"
namespace guestview { namespace guestview {
......
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
// Constants used for the WebView API. // Constants used for the WebView API.
#ifndef CHROME_BROWSER_GUEST_VIEW_GUEST_VIEW_CONSTANTS_H_ #ifndef EXTENSIONS_BROWSER_GUEST_VIEW_GUEST_VIEW_CONSTANTS_H_
#define CHROME_BROWSER_GUEST_VIEW_GUEST_VIEW_CONSTANTS_H_ #define EXTENSIONS_BROWSER_GUEST_VIEW_GUEST_VIEW_CONSTANTS_H_
namespace guestview { namespace guestview {
...@@ -25,5 +25,5 @@ extern const int kInstanceIDNone; ...@@ -25,5 +25,5 @@ extern const int kInstanceIDNone;
} // namespace guestview } // namespace guestview
#endif // CHROME_BROWSER_GUEST_VIEW_GUEST_VIEW_CONSTANTS_H_ #endif // EXTENSIONS_BROWSER_GUEST_VIEW_GUEST_VIEW_CONSTANTS_H_
...@@ -447,6 +447,8 @@ ...@@ -447,6 +447,8 @@
'browser/external_provider_interface.h', 'browser/external_provider_interface.h',
'browser/granted_file_entry.cc', 'browser/granted_file_entry.cc',
'browser/granted_file_entry.h', 'browser/granted_file_entry.h',
'browser/guest_view/guest_view_constants.cc',
'browser/guest_view/guest_view_constants.h',
'browser/image_loader.cc', 'browser/image_loader.cc',
'browser/image_loader.h', 'browser/image_loader.h',
'browser/image_loader_factory.cc', 'browser/image_loader_factory.cc',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment