diff options
| author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-23 04:00:35 +0000 |
|---|---|---|
| committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-23 04:00:35 +0000 |
| commit | 4e43a7fd013a5ec120ada1cc80c1f3521158fd46 (patch) | |
| tree | 0c1fe3bda72f53cdcd0fe76977999789d50c94e7 /content | |
| parent | 74de77b26cc62773f7c091abdf1130300203029f (diff) | |
| download | chromium_src-4e43a7fd013a5ec120ada1cc80c1f3521158fd46.zip chromium_src-4e43a7fd013a5ec120ada1cc80c1f3521158fd46.tar.gz chromium_src-4e43a7fd013a5ec120ada1cc80c1f3521158fd46.tar.bz2 | |
Attempt headless on win aura content_shell
Just headless failed on the plain Windows build, for reasons unclear.
Seems worth trying again on Aura. (Another possiblity if this fails on
bots might be to create and update the main window, but just not Show
it?)
R=jochen@chromium.org
BUG=257219
Review URL: https://chromiumcodereview.appspot.com/22887038
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@219204 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/shell/browser/shell_aura.cc | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/content/shell/browser/shell_aura.cc b/content/shell/browser/shell_aura.cc index d2d3c38..ba3366e 100644 --- a/content/shell/browser/shell_aura.cc +++ b/content/shell/browser/shell_aura.cc @@ -304,7 +304,8 @@ void Shell::PlatformExit() { std::vector<Shell*> windows = windows_; for (std::vector<Shell*>::iterator it = windows.begin(); it != windows.end(); ++it) { - (*it)->window_widget_->Close(); + if (!(*it)->headless_) + (*it)->window_widget_->Close(); } #if defined(OS_CHROMEOS) if (minimal_shell_) @@ -322,6 +323,8 @@ void Shell::PlatformCleanUp() { } void Shell::PlatformEnableUIControl(UIControl control, bool is_enabled) { + if (headless_) + return; ShellWindowDelegateView* delegate_view = static_cast<ShellWindowDelegateView*>(window_widget_->widget_delegate()); if (control == BACK_BUTTON) { @@ -337,6 +340,8 @@ void Shell::PlatformEnableUIControl(UIControl control, bool is_enabled) { } void Shell::PlatformSetAddressBarURL(const GURL& url) { + if (headless_) + return; ShellWindowDelegateView* delegate_view = static_cast<ShellWindowDelegateView*>(window_widget_->widget_delegate()); delegate_view->SetAddressBarURL(url); @@ -346,6 +351,8 @@ void Shell::PlatformSetIsLoading(bool loading) { } void Shell::PlatformCreateWindow(int width, int height) { + if (headless_) + return; #if defined(OS_CHROMEOS) window_widget_ = views::Widget::CreateWindowWithContextAndBounds( @@ -366,6 +373,8 @@ void Shell::PlatformCreateWindow(int width, int height) { } void Shell::PlatformSetContents() { + if (headless_) + return; ShellWindowDelegateView* delegate_view = static_cast<ShellWindowDelegateView*>(window_widget_->widget_delegate()); delegate_view->SetWebContents(web_contents_.get()); @@ -375,10 +384,14 @@ void Shell::PlatformResizeSubViews() { } void Shell::Close() { + if (headless_) + return; window_widget_->CloseNow(); } void Shell::PlatformSetTitle(const string16& title) { + if (headless_) + return; ShellWindowDelegateView* delegate_view = static_cast<ShellWindowDelegateView*>(window_widget_->widget_delegate()); delegate_view->SetWindowTitle(title); |