| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/views/extensions/shell_window_views.h" | 5 #include "chrome/browser/ui/views/extensions/shell_window_views.h" |
| 6 | 6 |
| 7 #include "base/utf_string_conversions.h" | 7 #include "base/utf_string_conversions.h" |
| 8 #include "chrome/browser/extensions/extension_host.h" | 8 #include "chrome/browser/extensions/extension_host.h" |
| 9 #include "chrome/common/extensions/extension.h" | 9 #include "chrome/common/extensions/extension.h" |
| 10 #include "content/public/browser/render_view_host.h" | 10 #include "content/public/browser/render_view_host.h" |
| (...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 245 } | 245 } |
| 246 | 246 |
| 247 bool ShellWindowViews::IsMinimized() const { | 247 bool ShellWindowViews::IsMinimized() const { |
| 248 return window_->IsMinimized(); | 248 return window_->IsMinimized(); |
| 249 } | 249 } |
| 250 | 250 |
| 251 bool ShellWindowViews::IsFullscreen() const { | 251 bool ShellWindowViews::IsFullscreen() const { |
| 252 return window_->IsFullscreen(); | 252 return window_->IsFullscreen(); |
| 253 } | 253 } |
| 254 | 254 |
| 255 gfx::NativeWindow ShellWindowViews::GetNativeWindow() { |
| 256 return window_->GetNativeWindow(); |
| 257 } |
| 258 |
| 255 gfx::Rect ShellWindowViews::GetRestoredBounds() const { | 259 gfx::Rect ShellWindowViews::GetRestoredBounds() const { |
| 256 return window_->GetRestoredBounds(); | 260 return window_->GetRestoredBounds(); |
| 257 } | 261 } |
| 258 | 262 |
| 259 gfx::Rect ShellWindowViews::GetBounds() const { | 263 gfx::Rect ShellWindowViews::GetBounds() const { |
| 260 return window_->GetWindowScreenBounds(); | 264 return window_->GetWindowScreenBounds(); |
| 261 } | 265 } |
| 262 | 266 |
| 263 void ShellWindowViews::Show() { | 267 void ShellWindowViews::Show() { |
| 264 if (window_->IsVisible()) { | 268 if (window_->IsVisible()) { |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 310 | 314 |
| 311 void ShellWindowViews::FlashFrame(bool flash) { | 315 void ShellWindowViews::FlashFrame(bool flash) { |
| 312 window_->FlashFrame(flash); | 316 window_->FlashFrame(flash); |
| 313 } | 317 } |
| 314 | 318 |
| 315 bool ShellWindowViews::IsAlwaysOnTop() const { | 319 bool ShellWindowViews::IsAlwaysOnTop() const { |
| 316 return false; | 320 return false; |
| 317 } | 321 } |
| 318 | 322 |
| 319 void ShellWindowViews::DeleteDelegate() { | 323 void ShellWindowViews::DeleteDelegate() { |
| 320 delete this; | 324 OnNativeClose(); |
| 321 } | 325 } |
| 322 | 326 |
| 323 void ShellWindowViews::ButtonPressed( | 327 void ShellWindowViews::ButtonPressed( |
| 324 views::Button* sender, const views::Event& event) { | 328 views::Button* sender, const views::Event& event) { |
| 325 Close(); | 329 Close(); |
| 326 } | 330 } |
| 327 | 331 |
| 328 bool ShellWindowViews::CanResize() const { | 332 bool ShellWindowViews::CanResize() const { |
| 329 return true; | 333 return true; |
| 330 } | 334 } |
| (...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 436 window_->UpdateWindowTitle(); | 440 window_->UpdateWindowTitle(); |
| 437 } | 441 } |
| 438 | 442 |
| 439 // static | 443 // static |
| 440 ShellWindow* ShellWindow::CreateImpl(Profile* profile, | 444 ShellWindow* ShellWindow::CreateImpl(Profile* profile, |
| 441 const extensions::Extension* extension, | 445 const extensions::Extension* extension, |
| 442 const GURL& url, | 446 const GURL& url, |
| 443 const ShellWindow::CreateParams params) { | 447 const ShellWindow::CreateParams params) { |
| 444 return new ShellWindowViews(profile, extension, url, params); | 448 return new ShellWindowViews(profile, extension, url, params); |
| 445 } | 449 } |
| OLD | NEW |