Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5992)

Unified Diff: chrome/browser/ui/cocoa/dev_tools_controller.mm

Issue 12334073: Remove WebContents methods that duplicate WebContentsView methods. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/cocoa/dev_tools_controller.mm
diff --git a/chrome/browser/ui/cocoa/dev_tools_controller.mm b/chrome/browser/ui/cocoa/dev_tools_controller.mm
index c07b5a3ba708137796f713f95f0881b5dd28fce1..7622e14dd58a54ab9fb59cab326885713ac007f6 100644
--- a/chrome/browser/ui/cocoa/dev_tools_controller.mm
+++ b/chrome/browser/ui/cocoa/dev_tools_controller.mm
@@ -15,6 +15,7 @@
#import "chrome/browser/ui/cocoa/view_id_util.h"
#include "chrome/common/pref_names.h"
#include "content/public/browser/web_contents.h"
+#include "content/public/browser/web_contents_view.h"
using content::WebContents;
@@ -142,7 +143,7 @@ using content::WebContents;
// |devToolsView| is a TabContentsViewCocoa object, whose ViewID was
// set to VIEW_ID_TAB_CONTAINER initially, so we need to change it to
// VIEW_ID_DEV_TOOLS_DOCKED here.
- NSView* devToolsView = devToolsContents->GetNativeView();
+ NSView* devToolsView = devToolsContents->GetView()->GetNativeView();
view_id_util::SetID(devToolsView, VIEW_ID_DEV_TOOLS_DOCKED);
[devToolsView setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
@@ -198,7 +199,8 @@ using content::WebContents;
}
- (void)updateDevToolsViewFrame {
- NSView* devToolsView = devToolsWindow_->web_contents()->GetNativeView();
+ NSView* devToolsView =
+ devToolsWindow_->web_contents()->GetView()->GetNativeView();
NSRect devToolsRect = [[devToolsView superview] bounds];
if (devToolsWindow_->dock_side() == DEVTOOLS_DOCK_SIDE_RIGHT)
devToolsRect.size.height -= [splitView_ topContentOffset];

Powered by Google App Engine
This is Rietveld 408576698