projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upstream version 7.36.149.0
[platform/framework/web/crosswalk.git]
/
src
/
chrome
/
browser
/
extensions
/
extension_view_host.cc
diff --git
a/src/chrome/browser/extensions/extension_view_host.cc
b/src/chrome/browser/extensions/extension_view_host.cc
index
3c86e27
..
12afacc
100644
(file)
--- a/
src/chrome/browser/extensions/extension_view_host.cc
+++ b/
src/chrome/browser/extensions/extension_view_host.cc
@@
-13,10
+13,8
@@
#include "chrome/browser/ui/browser_dialogs.h"
#include "components/web_modal/web_contents_modal_dialog_manager.h"
#include "content/public/browser/notification_source.h"
#include "chrome/browser/ui/browser_dialogs.h"
#include "components/web_modal/web_contents_modal_dialog_manager.h"
#include "content/public/browser/notification_source.h"
-#include "content/public/browser/render_frame_host.h"
#include "content/public/browser/render_view_host.h"
#include "content/public/browser/web_contents.h"
#include "content/public/browser/render_view_host.h"
#include "content/public/browser/web_contents.h"
-#include "content/public/browser/web_contents_view.h"
#include "extensions/browser/extension_system.h"
#include "extensions/browser/runtime_data.h"
#include "extensions/common/extension_messages.h"
#include "extensions/browser/extension_system.h"
#include "extensions/browser/runtime_data.h"
#include "extensions/common/extension_messages.h"
@@
-44,7
+42,7
@@
class ExtensionViewHost::AssociatedWebContentsObserver
virtual ~AssociatedWebContentsObserver() {}
// content::WebContentsObserver:
virtual ~AssociatedWebContentsObserver() {}
// content::WebContentsObserver:
- virtual void WebContentsDestroyed(
WebContents* web_contents
) OVERRIDE {
+ virtual void WebContentsDestroyed() OVERRIDE {
// Deleting |this| from here is safe.
host_->SetAssociatedWebContents(NULL);
}
// Deleting |this| from here is safe.
host_->SetAssociatedWebContents(NULL);
}
@@
-86,9
+84,6
@@
void ExtensionViewHost::CreateView(Browser* browser) {
#elif defined(OS_MACOSX)
view_.reset(new ExtensionViewMac(this, browser));
view_->Init();
#elif defined(OS_MACOSX)
view_.reset(new ExtensionViewMac(this, browser));
view_->Init();
-#elif defined(TOOLKIT_GTK)
- view_.reset(new ExtensionViewGtk(this, browser));
- view_->Init();
#else
// TODO(port)
NOTREACHED();
#else
// TODO(port)
NOTREACHED();
@@
-280,7
+275,7
@@
ExtensionViewHost::GetWebContentsModalDialogHost() {
}
bool ExtensionViewHost::IsWebContentsVisible(WebContents* web_contents) {
}
bool ExtensionViewHost::IsWebContentsVisible(WebContents* web_contents) {
- return platform_util::IsVisible(web_contents->Get
View()->Get
NativeView());
+ return platform_util::IsVisible(web_contents->GetNativeView());
}
gfx::NativeView ExtensionViewHost::GetHostView() const {
}
gfx::NativeView ExtensionViewHost::GetHostView() const {
@@
-290,7
+285,7
@@
gfx::NativeView ExtensionViewHost::GetHostView() const {
gfx::Point ExtensionViewHost::GetDialogPosition(const gfx::Size& size) {
if (!GetVisibleWebContents())
return gfx::Point();
gfx::Point ExtensionViewHost::GetDialogPosition(const gfx::Size& size) {
if (!GetVisibleWebContents())
return gfx::Point();
- gfx::Rect bounds = GetVisibleWebContents()->GetView
()->GetView
Bounds();
+ gfx::Rect bounds = GetVisibleWebContents()->GetViewBounds();
return gfx::Point(
std::max(0, (bounds.width() - size.width()) / 2),
std::max(0, (bounds.height() - size.height()) / 2));
return gfx::Point(
std::max(0, (bounds.width() - size.width()) / 2),
std::max(0, (bounds.height() - size.height()) / 2));
@@
-299,7
+294,7
@@
gfx::Point ExtensionViewHost::GetDialogPosition(const gfx::Size& size) {
gfx::Size ExtensionViewHost::GetMaximumDialogSize() {
if (!GetVisibleWebContents())
return gfx::Size();
gfx::Size ExtensionViewHost::GetMaximumDialogSize() {
if (!GetVisibleWebContents())
return gfx::Size();
- return GetVisibleWebContents()->GetView
()->GetView
Bounds().size();
+ return GetVisibleWebContents()->GetViewBounds().size();
}
void ExtensionViewHost::AddObserver(
}
void ExtensionViewHost::AddObserver(
@@
-344,7
+339,7
@@
void ExtensionViewHost::InsertInfobarCSS() {
ResourceBundle::GetSharedInstance().GetRawDataResource(
IDR_EXTENSIONS_INFOBAR_CSS));
ResourceBundle::GetSharedInstance().GetRawDataResource(
IDR_EXTENSIONS_INFOBAR_CSS));
- host_contents()->
GetMainFrame()->
InsertCSS(css.as_string());
+ host_contents()->InsertCSS(css.as_string());
}
} // namespace extensions
}
} // namespace extensions