summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-24 01:07:17 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-24 01:07:17 +0000
commitfd5b7e5247f197727c684941d585b48bb90d40ea (patch)
treeef8229b9387d1e43c87b492738337d32de301c65
parent9f170464e1ab4f1f75802a391db76408bc8998f2 (diff)
downloadchromium_src-fd5b7e5247f197727c684941d585b48bb90d40ea.zip
chromium_src-fd5b7e5247f197727c684941d585b48bb90d40ea.tar.gz
chromium_src-fd5b7e5247f197727c684941d585b48bb90d40ea.tar.bz2
views/examples: Remove the content dependency from examples_window.* component.
BUG=141187 TBR=ben@chromium.org Review URL: https://chromiumcodereview.appspot.com/10867027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@153134 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--ui/views/examples/examples_window.cc15
-rw-r--r--ui/views/examples/examples_window.h7
-rw-r--r--ui/views/examples/examples_window_with_content.cc4
3 files changed, 7 insertions, 19 deletions
diff --git a/ui/views/examples/examples_window.cc b/ui/views/examples/examples_window.cc
index 8e76efd..ace771d 100644
--- a/ui/views/examples/examples_window.cc
+++ b/ui/views/examples/examples_window.cc
@@ -8,7 +8,6 @@
#include "base/memory/scoped_vector.h"
#include "base/utf_string_conversions.h"
-#include "content/public/browser/browser_context.h"
#include "ui/base/models/combobox_model.h"
#include "ui/base/ui_base_paths.h"
#include "ui/views/controls/button/text_button.h"
@@ -35,7 +34,6 @@
#include "ui/views/examples/textfield_example.h"
#include "ui/views/examples/throbber_example.h"
#include "ui/views/examples/tree_view_example.h"
-#include "ui/views/examples/webview_example.h"
#include "ui/views/examples/widget_example.h"
#include "ui/views/focus/accelerator_handler.h"
#include "ui/views/layout/fill_layout.h"
@@ -75,13 +73,11 @@ class ComboboxModelExampleList : public ui::ComboboxModel {
class ExamplesWindowContents : public WidgetDelegateView,
public ComboboxListener {
public:
-ExamplesWindowContents(Operation operation,
- content::BrowserContext* browser_context)
+ ExamplesWindowContents(Operation operation)
: combobox_(new Combobox(&combobox_model_)),
example_shown_(new View),
status_label_(new Label),
- operation_(operation),
- browser_context_(browser_context) {
+ operation_(operation) {
instance_ = this;
combobox_->set_listener(this);
}
@@ -179,7 +175,6 @@ ExamplesWindowContents(Operation operation,
combobox_model_.AddExample(new TextfieldExample);
combobox_model_.AddExample(new ThrobberExample);
combobox_model_.AddExample(new TreeViewExample);
- combobox_model_.AddExample(new WebViewExample(browser_context_));
combobox_model_.AddExample(new WidgetExample);
}
@@ -197,13 +192,11 @@ ExamplesWindowContents(Operation operation,
// static
ExamplesWindowContents* ExamplesWindowContents::instance_ = NULL;
-void ShowExamplesWindow(Operation operation,
- content::BrowserContext* browser_context) {
+void ShowExamplesWindow(Operation operation) {
if (ExamplesWindowContents::instance()) {
ExamplesWindowContents::instance()->GetWidget()->Activate();
} else {
- Widget::CreateWindowWithBounds(new ExamplesWindowContents(operation,
- browser_context),
+ Widget::CreateWindowWithBounds(new ExamplesWindowContents(operation),
gfx::Rect(0, 0, 850, 300))->Show();
}
}
diff --git a/ui/views/examples/examples_window.h b/ui/views/examples/examples_window.h
index d3ef045..a3fc4e5 100644
--- a/ui/views/examples/examples_window.h
+++ b/ui/views/examples/examples_window.h
@@ -5,10 +5,6 @@
#ifndef UI_VIEWS_EXAMPLES_EXAMPLES_WINDOW_H_
#define UI_VIEWS_EXAMPLES_EXAMPLES_WINDOW_H_
-namespace content {
-class BrowserContext;
-}
-
namespace views {
namespace examples {
@@ -18,8 +14,7 @@ enum Operation {
};
// Shows a window with the views examples in it.
-void ShowExamplesWindow(Operation operation,
- content::BrowserContext* browser_context);
+void ShowExamplesWindow(Operation operation);
} // namespace examples
} // namespace views
diff --git a/ui/views/examples/examples_window_with_content.cc b/ui/views/examples/examples_window_with_content.cc
index 8c6a7e2..fedfa09 100644
--- a/ui/views/examples/examples_window_with_content.cc
+++ b/ui/views/examples/examples_window_with_content.cc
@@ -75,8 +75,8 @@ class ComboboxModelExampleList : public ui::ComboboxModel {
class ExamplesWindowContents : public WidgetDelegateView,
public ComboboxListener {
public:
-ExamplesWindowContents(Operation operation,
- content::BrowserContext* browser_context)
+ ExamplesWindowContents(Operation operation,
+ content::BrowserContext* browser_context)
: combobox_(new Combobox(&combobox_model_)),
example_shown_(new View),
status_label_(new Label),