summaryrefslogtreecommitdiffstats
path: root/chrome/renderer
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/renderer')
-rw-r--r--chrome/renderer/extensions/event_bindings.cc2
-rw-r--r--chrome/renderer/extensions/extension_custom_bindings.cc6
-rw-r--r--chrome/renderer/extensions/extension_dispatcher.cc2
-rw-r--r--chrome/renderer/extensions/extension_helper.cc16
-rw-r--r--chrome/renderer/extensions/extension_helper.h10
5 files changed, 18 insertions, 18 deletions
diff --git a/chrome/renderer/extensions/event_bindings.cc b/chrome/renderer/extensions/event_bindings.cc
index ac5b0aa..94a0203 100644
--- a/chrome/renderer/extensions/event_bindings.cc
+++ b/chrome/renderer/extensions/event_bindings.cc
@@ -9,10 +9,10 @@
#include "base/basictypes.h"
#include "base/lazy_instance.h"
#include "base/message_loop.h"
-#include "chrome/common/chrome_view_type.h"
#include "chrome/common/extensions/extension_messages.h"
#include "chrome/common/extensions/extension_set.h"
#include "chrome/common/url_constants.h"
+#include "chrome/common/view_type.h"
#include "chrome/renderer/extensions/chrome_v8_context.h"
#include "chrome/renderer/extensions/chrome_v8_context_set.h"
#include "chrome/renderer/extensions/chrome_v8_extension.h"
diff --git a/chrome/renderer/extensions/extension_custom_bindings.cc b/chrome/renderer/extensions/extension_custom_bindings.cc
index a301342..a513a26 100644
--- a/chrome/renderer/extensions/extension_custom_bindings.cc
+++ b/chrome/renderer/extensions/extension_custom_bindings.cc
@@ -7,11 +7,11 @@
#include <string>
#include "base/string_util.h"
-#include "chrome/common/chrome_view_type.h"
#include "chrome/common/extensions/extension.h"
#include "chrome/common/extensions/extension_action.h"
#include "chrome/common/extensions/extension_messages.h"
#include "chrome/common/url_constants.h"
+#include "chrome/common/view_type.h"
#include "chrome/renderer/extensions/extension_dispatcher.h"
#include "chrome/renderer/extensions/extension_helper.h"
#include "content/public/renderer/render_view.h"
@@ -49,9 +49,9 @@ v8::Handle<v8::Value> ExtensionCustomBindings::GetExtensionViews(
std::string view_type_string = *v8::String::Utf8Value(args[1]->ToString());
StringToUpperASCII(&view_type_string);
- // |view_type| == content::VIEW_TYPE_INVALID means getting any type of
+ // |view_type| == chrome::VIEW_TYPE_INVALID means getting any type of
// views.
- content::ViewType view_type = content::VIEW_TYPE_INVALID;
+ chrome::ViewType view_type = chrome::VIEW_TYPE_INVALID;
if (view_type_string == chrome::kViewTypeBackgroundPage) {
view_type = chrome::VIEW_TYPE_EXTENSION_BACKGROUND_PAGE;
} else if (view_type_string == chrome::kViewTypeInfobar) {
diff --git a/chrome/renderer/extensions/extension_dispatcher.cc b/chrome/renderer/extensions/extension_dispatcher.cc
index a070496..23efff8 100644
--- a/chrome/renderer/extensions/extension_dispatcher.cc
+++ b/chrome/renderer/extensions/extension_dispatcher.cc
@@ -11,12 +11,12 @@
#include "chrome/common/child_process_logging.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/chrome_version_info.h"
-#include "chrome/common/chrome_view_type.h"
#include "chrome/common/extensions/api/extension_api.h"
#include "chrome/common/extensions/extension.h"
#include "chrome/common/extensions/extension_messages.h"
#include "chrome/common/extensions/extension_permission_set.h"
#include "chrome/common/url_constants.h"
+#include "chrome/common/view_type.h"
#include "chrome/renderer/chrome_render_process_observer.h"
#include "chrome/renderer/extensions/api_definitions_natives.h"
#include "chrome/renderer/extensions/app_bindings.h"
diff --git a/chrome/renderer/extensions/extension_helper.cc b/chrome/renderer/extensions/extension_helper.cc
index 3aba7c4..aec4508 100644
--- a/chrome/renderer/extensions/extension_helper.cc
+++ b/chrome/renderer/extensions/extension_helper.cc
@@ -12,10 +12,10 @@
#include "base/message_loop.h"
#include "base/utf_string_conversions.h"
#include "chrome/common/chrome_switches.h"
-#include "chrome/common/chrome_view_type.h"
#include "chrome/common/extensions/extension_messages.h"
#include "chrome/common/render_messages.h"
#include "chrome/common/url_constants.h"
+#include "chrome/common/view_type.h"
#include "chrome/renderer/extensions/chrome_v8_context.h"
#include "chrome/renderer/extensions/extension_dispatcher.h"
#include "chrome/renderer/extensions/miscellaneous_bindings.h"
@@ -59,7 +59,7 @@ class ExtensionViewAccumulator : public content::RenderViewVisitor {
public:
ExtensionViewAccumulator(const std::string& extension_id,
int browser_window_id,
- content::ViewType view_type)
+ chrome::ViewType view_type)
: extension_id_(extension_id),
browser_window_id_(browser_window_id),
view_type_(view_type) {
@@ -94,12 +94,12 @@ class ExtensionViewAccumulator : public content::RenderViewVisitor {
private:
// Returns true if |type| "isa" |match|.
- static bool ViewTypeMatches(content::ViewType type, content::ViewType match) {
+ static bool ViewTypeMatches(chrome::ViewType type, chrome::ViewType match) {
if (type == match)
return true;
// INVALID means match all.
- if (match == content::VIEW_TYPE_INVALID)
+ if (match == chrome::VIEW_TYPE_INVALID)
return true;
return false;
@@ -107,7 +107,7 @@ class ExtensionViewAccumulator : public content::RenderViewVisitor {
std::string extension_id_;
int browser_window_id_;
- content::ViewType view_type_;
+ chrome::ViewType view_type_;
std::vector<content::RenderView*> views_;
};
@@ -117,7 +117,7 @@ class ExtensionViewAccumulator : public content::RenderViewVisitor {
std::vector<content::RenderView*> ExtensionHelper::GetExtensionViews(
const std::string& extension_id,
int browser_window_id,
- content::ViewType view_type) {
+ chrome::ViewType view_type) {
ExtensionViewAccumulator accumulator(
extension_id, browser_window_id, view_type);
content::RenderView::ForEach(&accumulator);
@@ -143,7 +143,7 @@ ExtensionHelper::ExtensionHelper(content::RenderView* render_view,
content::RenderViewObserverTracker<ExtensionHelper>(render_view),
extension_dispatcher_(extension_dispatcher),
pending_app_icon_requests_(0),
- view_type_(content::VIEW_TYPE_INVALID),
+ view_type_(chrome::VIEW_TYPE_INVALID),
browser_window_id_(-1) {
}
@@ -369,7 +369,7 @@ void ExtensionHelper::OnGetApplicationInfo(int page_id) {
routing_id(), page_id, app_info));
}
-void ExtensionHelper::OnNotifyRendererViewType(content::ViewType type) {
+void ExtensionHelper::OnNotifyRendererViewType(chrome::ViewType type) {
view_type_ = type;
}
diff --git a/chrome/renderer/extensions/extension_helper.h b/chrome/renderer/extensions/extension_helper.h
index 2376b94..4e88467 100644
--- a/chrome/renderer/extensions/extension_helper.h
+++ b/chrome/renderer/extensions/extension_helper.h
@@ -11,9 +11,9 @@
#include "base/memory/linked_ptr.h"
#include "base/memory/scoped_ptr.h"
+#include "chrome/common/view_type.h"
#include "content/public/renderer/render_view_observer.h"
#include "content/public/renderer/render_view_observer_tracker.h"
-#include "content/public/common/view_type.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLResponse.h"
class ExtensionDispatcher;
@@ -42,7 +42,7 @@ class ExtensionHelper
static std::vector<content::RenderView*> GetExtensionViews(
const std::string& extension_id,
int browser_window_id,
- content::ViewType view_type);
+ chrome::ViewType view_type);
// Returns the given extension's background page, or NULL if none.
static content::RenderView* GetBackgroundPage(
@@ -60,7 +60,7 @@ class ExtensionHelper
string16* error);
int browser_window_id() const { return browser_window_id_; }
- content::ViewType view_type() const { return view_type_; }
+ chrome::ViewType view_type() const { return view_type_; }
private:
// RenderViewObserver implementation.
@@ -91,7 +91,7 @@ class ExtensionHelper
void OnExtensionDispatchOnDisconnect(int port_id, bool connection_error);
void OnExecuteCode(const ExtensionMsg_ExecuteCode_Params& params);
void OnGetApplicationInfo(int page_id);
- void OnNotifyRendererViewType(content::ViewType view_type);
+ void OnNotifyRendererViewType(chrome::ViewType view_type);
void OnUpdateBrowserWindowId(int window_id);
// Callback triggered when we finish downloading the application definition
@@ -127,7 +127,7 @@ class ExtensionHelper
int pending_app_icon_requests_;
// Type of view attached with RenderView.
- content::ViewType view_type_;
+ chrome::ViewType view_type_;
// Id number of browser window which RenderView is attached to.
int browser_window_id_;
generated by cgit v1.1 at 2025-02-05 08:50:16 +0000