summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/browser/debugger/browser_list_tabcontents_provider.cc1
-rw-r--r--chrome/browser/debugger/devtools_sanity_browsertest.cc1
-rw-r--r--chrome/browser/debugger/devtools_window.cc69
-rw-r--r--chrome/browser/debugger/devtools_window.h16
-rw-r--r--chrome/browser/extensions/api/app_window/app_window_api.cc2
-rw-r--r--chrome/browser/extensions/platform_app_browsertest.cc2
-rw-r--r--chrome/browser/ui/cocoa/tabpose_window.mm4
-rw-r--r--chrome/browser/ui/gtk/browser_window_gtk.cc14
-rw-r--r--chrome/browser/ui/views/frame/browser_view.cc4
-rw-r--r--chrome/browser/ui/views/frame/browser_view.h1
10 files changed, 53 insertions, 61 deletions
diff --git a/chrome/browser/debugger/browser_list_tabcontents_provider.cc b/chrome/browser/debugger/browser_list_tabcontents_provider.cc
index 5d58d74..145728c 100644
--- a/chrome/browser/debugger/browser_list_tabcontents_provider.cc
+++ b/chrome/browser/debugger/browser_list_tabcontents_provider.cc
@@ -12,7 +12,6 @@
#include "chrome/browser/ui/browser_commands.h"
#include "chrome/browser/ui/browser_list.h"
#include "chrome/browser/ui/browser_tabstrip.h"
-#include "chrome/browser/ui/tab_contents/tab_contents.h"
#include "chrome/common/chrome_paths.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/web_contents.h"
diff --git a/chrome/browser/debugger/devtools_sanity_browsertest.cc b/chrome/browser/debugger/devtools_sanity_browsertest.cc
index ce9b4d5..4266e66 100644
--- a/chrome/browser/debugger/devtools_sanity_browsertest.cc
+++ b/chrome/browser/debugger/devtools_sanity_browsertest.cc
@@ -19,7 +19,6 @@
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_commands.h"
#include "chrome/browser/ui/browser_tabstrip.h"
-#include "chrome/browser/ui/tab_contents/tab_contents.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h"
#include "chrome/common/chrome_notification_types.h"
#include "chrome/common/chrome_paths.h"
diff --git a/chrome/browser/debugger/devtools_window.cc b/chrome/browser/debugger/devtools_window.cc
index 0dc9e26..a268f65 100644
--- a/chrome/browser/debugger/devtools_window.cc
+++ b/chrome/browser/debugger/devtools_window.cc
@@ -25,7 +25,6 @@
#include "chrome/browser/themes/theme_service_factory.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_list.h"
-#include "chrome/browser/ui/browser_tabstrip.h"
#include "chrome/browser/ui/browser_window.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h"
#include "chrome/common/chrome_notification_types.h"
@@ -163,7 +162,7 @@ DevToolsWindow* DevToolsWindow::ToggleDevToolsWindow(
return NULL;
}
RenderViewHost* inspected_rvh =
- chrome::GetActiveWebContents(browser)->GetRenderViewHost();
+ browser->tab_strip_model()->GetActiveWebContents()->GetRenderViewHost();
return ToggleDevToolsWindow(inspected_rvh,
action == DEVTOOLS_TOGGLE_ACTION_INSPECT,
@@ -187,41 +186,39 @@ DevToolsWindow* DevToolsWindow::Create(
RenderViewHost* inspected_rvh,
DevToolsDockSide dock_side,
bool shared_worker_frontend) {
- // Create TabContents with devtools.
- TabContents* tab_contents = chrome::TabContentsFactory(
- content::WebContents::CreateParams(profile));
- tab_contents->web_contents()->GetRenderViewHost()->AllowBindings(
+ // Create WebContents with devtools.
+ WebContents* web_contents =
+ WebContents::Create(WebContents::CreateParams(profile));
+ web_contents->GetRenderViewHost()->AllowBindings(
content::BINDINGS_POLICY_WEB_UI);
- tab_contents->web_contents()->GetController().LoadURL(
+ web_contents->GetController().LoadURL(
GetDevToolsUrl(profile, dock_side, shared_worker_frontend),
content::Referrer(),
content::PAGE_TRANSITION_AUTO_TOPLEVEL,
std::string());
- return new DevToolsWindow(tab_contents, profile, inspected_rvh, dock_side);
+ return new DevToolsWindow(web_contents, profile, inspected_rvh, dock_side);
}
-DevToolsWindow::DevToolsWindow(TabContents* tab_contents,
+DevToolsWindow::DevToolsWindow(WebContents* web_contents,
Profile* profile,
RenderViewHost* inspected_rvh,
DevToolsDockSide dock_side)
: profile_(profile),
inspected_web_contents_(NULL),
- tab_contents_(tab_contents),
+ web_contents_(web_contents),
browser_(NULL),
dock_side_(dock_side),
is_loaded_(false),
action_on_load_(DEVTOOLS_TOGGLE_ACTION_SHOW),
width_(-1),
height_(-1) {
- frontend_host_ = DevToolsClientHost::CreateDevToolsFrontendHost(
- tab_contents->web_contents(),
- this);
+ frontend_host_ = DevToolsClientHost::CreateDevToolsFrontendHost(web_contents,
+ this);
file_helper_.reset(new DevToolsFileHelper(profile, this));
g_instances.Get().push_back(this);
// Wipe out page icon so that the default application icon is used.
- NavigationEntry* entry =
- tab_contents_->web_contents()->GetController().GetActiveEntry();
+ NavigationEntry* entry = web_contents->GetController().GetActiveEntry();
entry->GetFavicon().image = gfx::Image();
entry->GetFavicon().valid = true;
@@ -229,13 +226,11 @@ DevToolsWindow::DevToolsWindow(TabContents* tab_contents,
registrar_.Add(
this,
content::NOTIFICATION_LOAD_STOP,
- content::Source<NavigationController>(
- &tab_contents_->web_contents()->GetController()));
+ content::Source<NavigationController>(&web_contents->GetController()));
registrar_.Add(
this,
chrome::NOTIFICATION_TAB_CLOSING,
- content::Source<NavigationController>(
- &tab_contents_->web_contents()->GetController()));
+ content::Source<NavigationController>(&web_contents->GetController()));
registrar_.Add(
this,
chrome::NOTIFICATION_BROWSER_THEME_CHANGED,
@@ -261,13 +256,13 @@ void DevToolsWindow::InspectedContentsClosing() {
BrowserWindow* inspected_window = GetInspectedBrowserWindow();
if (inspected_window)
inspected_window->UpdateDevTools();
- // In case of docked tab_contents we own it, so delete here.
- delete tab_contents_;
+ // In case of docked web_contents_, we own it so delete here.
+ delete web_contents_;
delete this;
} else {
// First, initiate self-destruct to free all the registrars.
- // Then close all tabs. Browser will take care of deleting tab_contents
+ // Then close all tabs. Browser will take care of deleting web_contents_
// for us.
Browser* browser = browser_;
delete this;
@@ -288,9 +283,9 @@ void DevToolsWindow::Show(DevToolsToggleAction action) {
FindInspectedBrowserAndTabIndex(&inspected_browser,
&inspected_tab_index)) {
BrowserWindow* inspected_window = inspected_browser->window();
- tab_contents_->web_contents()->SetDelegate(this);
+ web_contents_->SetDelegate(this);
inspected_window->UpdateDevTools();
- tab_contents_->web_contents()->GetView()->SetInitialFocus();
+ web_contents_->GetView()->SetInitialFocus();
inspected_window->Show();
TabStripModel* tab_strip_model = inspected_browser->tab_strip_model();
tab_strip_model->ActivateTabAt(inspected_tab_index, true);
@@ -312,7 +307,7 @@ void DevToolsWindow::Show(DevToolsToggleAction action) {
if (should_show_window) {
browser_->window()->Show();
- tab_contents_->web_contents()->GetView()->SetInitialFocus();
+ web_contents_->GetView()->SetInitialFocus();
}
ScheduleAction(action);
@@ -370,7 +365,7 @@ void DevToolsWindow::SetHeight(int height) {
}
RenderViewHost* DevToolsWindow::GetRenderViewHost() {
- return tab_contents_->web_contents()->GetRenderViewHost();
+ return web_contents_->GetRenderViewHost();
}
void DevToolsWindow::CreateDevToolsBrowser() {
@@ -399,7 +394,7 @@ void DevToolsWindow::CreateDevToolsBrowser() {
browser_ = new Browser(Browser::CreateParams::CreateForDevTools(profile_));
browser_->tab_strip_model()->AddWebContents(
- tab_contents_->web_contents(), -1, content::PAGE_TRANSITION_AUTO_TOPLEVEL,
+ web_contents_, -1, content::PAGE_TRANSITION_AUTO_TOPLEVEL,
TabStripModel::ADD_ACTIVE);
}
@@ -455,8 +450,10 @@ void DevToolsWindow::AddDevToolsExtensionsToClient() {
}
}
ListValue results;
+ Profile* profile =
+ Profile::FromBrowserContext(web_contents_->GetBrowserContext());
const ExtensionService* extension_service = extensions::ExtensionSystem::Get(
- tab_contents_->profile()->GetOriginalProfile())->extension_service();
+ profile->GetOriginalProfile())->extension_service();
if (!extension_service)
return;
@@ -494,7 +491,7 @@ void DevToolsWindow::CallClientFunction(const std::string& function_name,
string16 javascript =
ASCIIToUTF16(function_name + "(" + json + ");");
- tab_contents_->web_contents()->GetRenderViewHost()->
+ web_contents_->GetRenderViewHost()->
ExecuteJavascriptInWebFrame(string16(), javascript);
}
@@ -508,7 +505,7 @@ void DevToolsWindow::Observe(int type,
AddDevToolsExtensionsToClient();
} else if (type == chrome::NOTIFICATION_TAB_CLOSING) {
if (content::Source<NavigationController>(source).ptr() ==
- &tab_contents_->web_contents()->GetController()) {
+ &web_contents_->GetController()) {
// This happens when browser closes all of its tabs as a result
// of window.Close event.
// Notify manager that this DevToolsClientHost no longer exists and
@@ -593,7 +590,7 @@ void DevToolsWindow::UpdateTheme() {
"InspectorFrontendAPI.setToolbarColors(\"%s\", \"%s\")",
SkColorToRGBAString(color_toolbar).c_str(),
SkColorToRGBAString(color_tab_text).c_str());
- tab_contents_->web_contents()->GetRenderViewHost()->
+ web_contents_->GetRenderViewHost()->
ExecuteJavascriptInWebFrame(string16(), UTF8ToUTF16(command));
}
@@ -611,7 +608,7 @@ void DevToolsWindow::AddNewContents(WebContents* source,
}
bool DevToolsWindow::PreHandleKeyboardEvent(
- content::WebContents* source,
+ WebContents* source,
const NativeWebKeyboardEvent& event, bool* is_keyboard_shortcut) {
if (IsDocked()) {
BrowserWindow* inspected_window = GetInspectedBrowserWindow();
@@ -622,7 +619,7 @@ bool DevToolsWindow::PreHandleKeyboardEvent(
return false;
}
-void DevToolsWindow::HandleKeyboardEvent(content::WebContents* source,
+void DevToolsWindow::HandleKeyboardEvent(WebContents* source,
const NativeWebKeyboardEvent& event) {
if (IsDocked()) {
if (event.windowsKeyCode == 0x08) {
@@ -695,7 +692,7 @@ DevToolsWindow* DevToolsWindow::AsDevToolsWindow(RenderViewHost* window_rvh) {
DevToolsWindowList& instances = g_instances.Get();
for (DevToolsWindowList::iterator it = instances.begin();
it != instances.end(); ++it) {
- if ((*it)->tab_contents_->web_contents()->GetRenderViewHost() == window_rvh)
+ if ((*it)->web_contents_->GetRenderViewHost() == window_rvh)
return *it;
}
return NULL;
@@ -709,7 +706,7 @@ void DevToolsWindow::ActivateWindow() {
} else {
BrowserWindow* inspected_window = GetInspectedBrowserWindow();
if (inspected_window)
- tab_contents_->web_contents()->GetView()->Focus();
+ web_contents_->GetView()->Focus();
}
}
@@ -745,7 +742,7 @@ void DevToolsWindow::SetDockSide(const std::string& side) {
// the browser object's close and delete. Remove observer first.
TabStripModel* tab_strip_model = browser_->tab_strip_model();
tab_strip_model->DetachWebContentsAt(
- tab_strip_model->GetIndexOfTabContents(tab_contents_));
+ tab_strip_model->GetIndexOfWebContents(web_contents_));
browser_ = NULL;
}
} else if (is_docked) {
diff --git a/chrome/browser/debugger/devtools_window.h b/chrome/browser/debugger/devtools_window.h
index c6f076f..0d74d12 100644
--- a/chrome/browser/debugger/devtools_window.h
+++ b/chrome/browser/debugger/devtools_window.h
@@ -19,15 +19,10 @@
#include "content/public/browser/notification_registrar.h"
#include "content/public/browser/web_contents_delegate.h"
-namespace IPC {
-class Message;
-}
-
class Browser;
class BrowserWindow;
class PrefService;
class Profile;
-class TabContents;
namespace base {
class Value;
@@ -41,6 +36,10 @@ class RenderViewHost;
class WebContents;
}
+namespace IPC {
+class Message;
+}
+
enum DevToolsDockSide {
DEVTOOLS_DOCK_SIDE_UNDOCKED = 0,
DEVTOOLS_DOCK_SIDE_BOTTOM,
@@ -85,8 +84,7 @@ class DevToolsWindow : private content::NotificationObserver,
void Show(DevToolsToggleAction action);
- content::WebContents* web_contents() { return tab_contents_->web_contents(); }
- TabContents* tab_contents() { return tab_contents_; }
+ content::WebContents* web_contents() { return web_contents_; }
Browser* browser() { return browser_; } // For tests.
DevToolsDockSide dock_side() { return dock_side_; }
content::DevToolsClientHost* devtools_client_host() { return frontend_host_; }
@@ -114,7 +112,7 @@ class DevToolsWindow : private content::NotificationObserver,
content::RenderViewHost* inspected_rvh,
DevToolsDockSide dock_side,
bool shared_worker_frontend);
- DevToolsWindow(TabContents* tab_contents,
+ DevToolsWindow(content::WebContents* web_contents,
Profile* profile,
content::RenderViewHost* inspected_rvh,
DevToolsDockSide dock_side);
@@ -193,7 +191,7 @@ class DevToolsWindow : private content::NotificationObserver,
Profile* profile_;
content::WebContents* inspected_web_contents_;
- TabContents* tab_contents_;
+ content::WebContents* web_contents_;
Browser* browser_;
DevToolsDockSide dock_side_;
bool is_loaded_;
diff --git a/chrome/browser/extensions/api/app_window/app_window_api.cc b/chrome/browser/extensions/api/app_window/app_window_api.cc
index 6bad630..3cee683 100644
--- a/chrome/browser/extensions/api/app_window/app_window_api.cc
+++ b/chrome/browser/extensions/api/app_window/app_window_api.cc
@@ -58,7 +58,7 @@ class DevToolsRestorer : public content::NotificationObserver {
this,
content::NOTIFICATION_LOAD_STOP,
content::Source<content::NavigationController>(
- &devtools_window->tab_contents()->web_contents()->GetController()));
+ &devtools_window->web_contents()->GetController()));
}
protected:
diff --git a/chrome/browser/extensions/platform_app_browsertest.cc b/chrome/browser/extensions/platform_app_browsertest.cc
index e9f732a..dbdbd1c 100644
--- a/chrome/browser/extensions/platform_app_browsertest.cc
+++ b/chrome/browser/extensions/platform_app_browsertest.cc
@@ -715,7 +715,7 @@ void PlatformAppDevToolsBrowserTest::RunTestWithDevTools(
content::WindowedNotificationObserver loaded_observer(
content::NOTIFICATION_LOAD_STOP,
content::Source<content::NavigationController>(
- &devtools_window->tab_contents()->web_contents()->GetController()));
+ &devtools_window->web_contents()->GetController()));
loaded_observer.Wait();
ASSERT_TRUE(DevToolsAgentHostRegistry::HasDevToolsAgentHost(rvh));
diff --git a/chrome/browser/ui/cocoa/tabpose_window.mm b/chrome/browser/ui/cocoa/tabpose_window.mm
index be614f4..d85d5ed 100644
--- a/chrome/browser/ui/cocoa/tabpose_window.mm
+++ b/chrome/browser/ui/cocoa/tabpose_window.mm
@@ -245,8 +245,8 @@ void ThumbnailLoader::LoadThumbnail() {
int bottomOffset = 0;
DevToolsWindow* devToolsWindow =
DevToolsWindow::GetDockedInstanceForInspectedTab(contents_);
- content::WebContents* devToolsContents = devToolsWindow ?
- devToolsWindow->tab_contents()->web_contents() : NULL;
+ content::WebContents* devToolsContents =
+ devToolsWindow ? devToolsWindow->web_contents() : NULL;
if (devToolsContents && devToolsContents->GetRenderViewHost() &&
devToolsContents->GetRenderViewHost()->GetView()) {
// The devtool's size might not be up-to-date, but since its height doesn't
diff --git a/chrome/browser/ui/gtk/browser_window_gtk.cc b/chrome/browser/ui/gtk/browser_window_gtk.cc
index 04dba7d..8011533 100644
--- a/chrome/browser/ui/gtk/browser_window_gtk.cc
+++ b/chrome/browser/ui/gtk/browser_window_gtk.cc
@@ -2302,18 +2302,16 @@ void BrowserWindowGtk::UpdateDevToolsForContents(WebContents* contents) {
// Replace tab contents.
if (devtools_window_ != new_devtools_window) {
- if (devtools_window_) {
- devtools_container_->DetachTab(
- devtools_window_->tab_contents()->web_contents());
- }
- devtools_container_->SetTab(new_devtools_window ?
- new_devtools_window->tab_contents()->web_contents() : NULL);
+ if (devtools_window_)
+ devtools_container_->DetachTab(devtools_window_->web_contents());
+ devtools_container_->SetTab(
+ new_devtools_window ? new_devtools_window->web_contents() : NULL);
if (new_devtools_window) {
- // WebContentsViewGtk::WasShown is not called when tab contents is shown
+ // WebContentsViewGtk::WasShown is not called when a web contents is shown
// by anything other than user selecting a Tab.
// See TabContentsViewViews::OnWindowPosChanged for reference on how it
// should be implemented.
- new_devtools_window->tab_contents()->web_contents()->WasShown();
+ new_devtools_window->web_contents()->WasShown();
}
}
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc
index ef132b7..f9487d6 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -2312,8 +2312,8 @@ void BrowserView::UpdateDevToolsForContents(WebContents* web_contents) {
// Replace tab contents.
if (devtools_window_ != new_devtools_window) {
- devtools_container_->SetWebContents(new_devtools_window ?
- new_devtools_window->tab_contents()->web_contents() : NULL);
+ devtools_container_->SetWebContents(
+ new_devtools_window ? new_devtools_window->web_contents() : NULL);
}
// Store last used position.
diff --git a/chrome/browser/ui/views/frame/browser_view.h b/chrome/browser/ui/views/frame/browser_view.h
index 294d107..df7061a 100644
--- a/chrome/browser/ui/views/frame/browser_view.h
+++ b/chrome/browser/ui/views/frame/browser_view.h
@@ -50,6 +50,7 @@ class InstantPreviewControllerViews;
class LocationBarView;
class StatusBubbleViews;
class SearchViewController;
+class TabContents;
class TabStrip;
class TabStripModel;
class ToolbarView;
generated by cgit v1.1 at 2025-05-16 07:55:57 +0000