diff options
author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-23 18:52:35 +0000 |
---|---|---|
committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-23 18:52:35 +0000 |
commit | 8a1cc07176574962b360ff826015c74beecc87d2 (patch) | |
tree | b4c93f0b0667cee474cb4317e2ecb12514a47887 /views/desktop | |
parent | 2d758a10306f871b80b9584c8a1f080fd455ebdb (diff) | |
download | chromium_src-8a1cc07176574962b360ff826015c74beecc87d2.zip chromium_src-8a1cc07176574962b360ff826015c74beecc87d2.tar.gz chromium_src-8a1cc07176574962b360ff826015c74beecc87d2.tar.bz2 |
Add an option to run Chrome in the views desktop.
- Add a BrowserFrameViews stub.
- Add a NativeTabContentsViewViews stub.
- Allow the omnibox to run in pure-views mode on Windows too.
- Make the RenderWidgetHostViewViews build on Windows.
chrome --use-pure-views --views-desktop runs, shows a browser window, but doesn't really do anything else.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/7206055
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90242 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/desktop')
-rw-r--r-- | views/desktop/desktop_main.cc | 4 | ||||
-rw-r--r-- | views/desktop/desktop_window.cc | 45 | ||||
-rw-r--r-- | views/desktop/desktop_window.h | 24 |
3 files changed, 35 insertions, 38 deletions
diff --git a/views/desktop/desktop_main.cc b/views/desktop/desktop_main.cc index 54da0e6..0c7839c 100644 --- a/views/desktop/desktop_main.cc +++ b/views/desktop/desktop_main.cc @@ -47,6 +47,10 @@ int main(int argc, char** argv) { views::Widget::SetPureViews(true); views::desktop::DesktopWindow::CreateDesktopWindow(); + views::desktop::DesktopWindow::desktop_window->CreateTestWindow( + L"Sample Window 1", SK_ColorWHITE, gfx::Rect(500, 200, 400, 400), true); + views::desktop::DesktopWindow::desktop_window->CreateTestWindow( + L"Sample Window 2", SK_ColorRED, gfx::Rect(600, 450, 450, 300), false); views::AcceleratorHandler accelerator_handler; MessageLoopForUI::current()->Run(&accelerator_handler); diff --git a/views/desktop/desktop_window.cc b/views/desktop/desktop_window.cc index 4abce7f..bfdecd5 100644 --- a/views/desktop/desktop_window.cc +++ b/views/desktop/desktop_window.cc @@ -109,11 +109,6 @@ void DesktopWindow::CreateDesktopWindow() { params.bounds = gfx::Rect(20, 20, 1920, 1200); window->Init(params); window->Show(); - - desktop_window->CreateTestWindow(L"Sample Window 1", SK_ColorWHITE, - gfx::Rect(500, 200, 400, 400), true); - desktop_window->CreateTestWindow(L"Sample Window 2", SK_ColorRED, - gfx::Rect(600, 450, 450, 300), false); } void DesktopWindow::ActivateWidget(Widget* widget) { @@ -129,6 +124,25 @@ void DesktopWindow::ActivateWidget(Widget* widget) { } } + +void DesktopWindow::CreateTestWindow(const std::wstring& title, + SkColor color, + gfx::Rect initial_bounds, + bool rotate) { + views::Widget* window = views::Widget::CreateWindowWithBounds( + new TestWindowContentView(title, color), + initial_bounds); + window->Show(); + + if (rotate) { + ui::Transform transform; + transform.SetRotate(90.0f); + transform.SetTranslateX(window->GetWindowScreenBounds().width()); + static_cast<NativeWidgetViews*>(window->native_widget())->GetView()-> + SetTransform(transform); + } +} + //////////////////////////////////////////////////////////////////////////////// // DesktopWindow, View overrides: @@ -170,26 +184,5 @@ View* DesktopWindow::GetContentsView() { return this; } -//////////////////////////////////////////////////////////////////////////////// -// DesktopWindow, private: - -void DesktopWindow::CreateTestWindow(const std::wstring& title, - SkColor color, - gfx::Rect initial_bounds, - bool rotate) { - views::Widget* window = views::Widget::CreateWindowWithBounds( - new TestWindowContentView(title, color), - initial_bounds); - window->Show(); - - if (rotate) { - ui::Transform transform; - transform.SetRotate(90.0f); - transform.SetTranslateX(window->GetWindowScreenBounds().width()); - static_cast<NativeWidgetViews*>(window->native_widget())->GetView()-> - SetTransform(transform); - } -} - } // namespace desktop } // namespace views diff --git a/views/desktop/desktop_window.h b/views/desktop/desktop_window.h index 9012939..7b477d5c 100644 --- a/views/desktop/desktop_window.h +++ b/views/desktop/desktop_window.h @@ -15,16 +15,21 @@ namespace desktop { class DesktopWindow : public WidgetDelegateView { public: - static DesktopWindow* desktop_window; + static DesktopWindow* desktop_window; - DesktopWindow(); - virtual ~DesktopWindow(); + DesktopWindow(); + virtual ~DesktopWindow(); - static void CreateDesktopWindow(); + static void CreateDesktopWindow(); - // Changes activation to the specified Widget. The currently active Widget - // is de-activated. - void ActivateWidget(Widget* widget); + // Changes activation to the specified Widget. The currently active Widget + // is de-activated. + void ActivateWidget(Widget* widget); + + void CreateTestWindow(const std::wstring& title, + SkColor color, + gfx::Rect initial_bounds, + bool rotate); private: // Overridden from View: @@ -40,11 +45,6 @@ class DesktopWindow : public WidgetDelegateView { virtual void WindowClosing() OVERRIDE; virtual View* GetContentsView() OVERRIDE; - void CreateTestWindow(const std::wstring& title, - SkColor color, - gfx::Rect initial_bounds, - bool rotate); - NativeWidgetViews* active_widget_; DISALLOW_COPY_AND_ASSIGN(DesktopWindow); |