diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-21 17:33:52 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-21 17:33:52 +0000 |
| commit | 738a72134925300c3b62deff96239e53ee49c817 (patch) | |
| tree | 94127c8687d95fc1971304f1e420b76063806389 /content/shell | |
| parent | 4d680a9e0eab6dc194d4761f96b0e0876d12e2ad (diff) | |
| download | chromium_src-738a72134925300c3b62deff96239e53ee49c817.zip chromium_src-738a72134925300c3b62deff96239e53ee49c817.tar.gz chromium_src-738a72134925300c3b62deff96239e53ee49c817.tar.bz2 | |
Move PepperPluginInfo to content/public/common and put it into the content namespace.
BUG=98716
Review URL: http://codereview.chromium.org/8366027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106731 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/shell')
| -rw-r--r-- | content/shell/shell_content_client.cc | 2 | ||||
| -rw-r--r-- | content/shell/shell_content_client.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/content/shell/shell_content_client.cc b/content/shell/shell_content_client.cc index 5caaef0..bc98458 100644 --- a/content/shell/shell_content_client.cc +++ b/content/shell/shell_content_client.cc @@ -19,7 +19,7 @@ void ShellContentClient::SetGpuInfo(const GPUInfo& gpu_info) { } void ShellContentClient::AddPepperPlugins( - std::vector<PepperPluginInfo>* plugins) { + std::vector<content::PepperPluginInfo>* plugins) { } bool ShellContentClient::CanSendWhileSwappedOut(const IPC::Message* msg) { diff --git a/content/shell/shell_content_client.h b/content/shell/shell_content_client.h index 767241e..8494e99 100644 --- a/content/shell/shell_content_client.h +++ b/content/shell/shell_content_client.h @@ -18,7 +18,7 @@ class ShellContentClient : public ContentClient { virtual void SetActiveURL(const GURL& url) OVERRIDE; virtual void SetGpuInfo(const GPUInfo& gpu_info) OVERRIDE; virtual void AddPepperPlugins( - std::vector<PepperPluginInfo>* plugins) OVERRIDE; + std::vector<content::PepperPluginInfo>* plugins) OVERRIDE; virtual bool CanSendWhileSwappedOut(const IPC::Message* msg) OVERRIDE; virtual bool CanHandleWhileSwappedOut(const IPC::Message& msg) OVERRIDE; virtual std::string GetUserAgent(bool* overriding) const OVERRIDE; |