| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "apps/shell_window.h" | 5 #include "apps/shell_window.h" |
| 6 | 6 |
| 7 #include "apps/native_app_window.h" | 7 #include "apps/native_app_window.h" |
| 8 #include "apps/shell_window_geometry_cache.h" | 8 #include "apps/shell_window_geometry_cache.h" |
| 9 #include "base/strings/string_util.h" | 9 #include "base/strings/string_util.h" |
| 10 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
| (...skipping 436 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 447 } | 447 } |
| 448 | 448 |
| 449 void ShellWindow::CloseContents(WebContents* contents) { | 449 void ShellWindow::CloseContents(WebContents* contents) { |
| 450 native_app_window_->Close(); | 450 native_app_window_->Close(); |
| 451 } | 451 } |
| 452 | 452 |
| 453 bool ShellWindow::ShouldSuppressDialogs() { | 453 bool ShellWindow::ShouldSuppressDialogs() { |
| 454 return true; | 454 return true; |
| 455 } | 455 } |
| 456 | 456 |
| 457 content::ColorChooser* ShellWindow::OpenColorChooser(WebContents* web_contents, | 457 content::ColorChooser* ShellWindow::OpenColorChooser( |
| 458 SkColor initial_color) { | 458 WebContents* web_contents, |
| 459 SkColor initial_color, |
| 460 const std::vector<SkColor>& suggestions, |
| 461 const std::vector<string16>& suggestion_labels) { |
| 459 return delegate_->ShowColorChooser(web_contents, initial_color); | 462 return delegate_->ShowColorChooser(web_contents, initial_color); |
| 460 } | 463 } |
| 461 | 464 |
| 462 void ShellWindow::RunFileChooser(WebContents* tab, | 465 void ShellWindow::RunFileChooser(WebContents* tab, |
| 463 const content::FileChooserParams& params) { | 466 const content::FileChooserParams& params) { |
| 464 if (window_type_is_panel()) { | 467 if (window_type_is_panel()) { |
| 465 // Panels can't host a file dialog, abort. TODO(stevenjb): allow file | 468 // Panels can't host a file dialog, abort. TODO(stevenjb): allow file |
| 466 // dialogs to be unhosted but still close with the owning web contents. | 469 // dialogs to be unhosted but still close with the owning web contents. |
| 467 // crbug.com/172502. | 470 // crbug.com/172502. |
| 468 LOG(WARNING) << "File dialog opened by panel."; | 471 LOG(WARNING) << "File dialog opened by panel."; |
| (...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 626 region.bounds.x(), | 629 region.bounds.x(), |
| 627 region.bounds.y(), | 630 region.bounds.y(), |
| 628 region.bounds.right(), | 631 region.bounds.right(), |
| 629 region.bounds.bottom(), | 632 region.bounds.bottom(), |
| 630 region.draggable ? SkRegion::kUnion_Op : SkRegion::kDifference_Op); | 633 region.draggable ? SkRegion::kUnion_Op : SkRegion::kDifference_Op); |
| 631 } | 634 } |
| 632 return sk_region; | 635 return sk_region; |
| 633 } | 636 } |
| 634 | 637 |
| 635 } // namespace apps | 638 } // namespace apps |
| OLD | NEW |