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/shell_window_geometry_cache.h" | 7 #include "apps/shell_window_geometry_cache.h" |
8 #include "apps/shell_window_registry.h" | 8 #include "apps/shell_window_registry.h" |
9 #include "apps/ui/native_app_window.h" | 9 #include "apps/ui/native_app_window.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 514 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
525 } | 525 } |
526 | 526 |
527 void ShellWindow::CloseContents(WebContents* contents) { | 527 void ShellWindow::CloseContents(WebContents* contents) { |
528 native_app_window_->Close(); | 528 native_app_window_->Close(); |
529 } | 529 } |
530 | 530 |
531 bool ShellWindow::ShouldSuppressDialogs() { | 531 bool ShellWindow::ShouldSuppressDialogs() { |
532 return true; | 532 return true; |
533 } | 533 } |
534 | 534 |
535 content::ColorChooser* ShellWindow::OpenColorChooser(WebContents* web_contents, | 535 content::ColorChooser* ShellWindow::OpenColorChooser( |
536 SkColor initial_color) { | 536 WebContents* web_contents, |
| 537 SkColor initial_color, |
| 538 const std::vector<SkColor>& suggestions, |
| 539 const std::vector<string16>& suggestion_labels) { |
537 return delegate_->ShowColorChooser(web_contents, initial_color); | 540 return delegate_->ShowColorChooser(web_contents, initial_color); |
538 } | 541 } |
539 | 542 |
540 void ShellWindow::RunFileChooser(WebContents* tab, | 543 void ShellWindow::RunFileChooser(WebContents* tab, |
541 const content::FileChooserParams& params) { | 544 const content::FileChooserParams& params) { |
542 if (window_type_is_panel()) { | 545 if (window_type_is_panel()) { |
543 // Panels can't host a file dialog, abort. TODO(stevenjb): allow file | 546 // Panels can't host a file dialog, abort. TODO(stevenjb): allow file |
544 // dialogs to be unhosted but still close with the owning web contents. | 547 // dialogs to be unhosted but still close with the owning web contents. |
545 // crbug.com/172502. | 548 // crbug.com/172502. |
546 LOG(WARNING) << "File dialog opened by panel."; | 549 LOG(WARNING) << "File dialog opened by panel."; |
(...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
749 region.bounds.x(), | 752 region.bounds.x(), |
750 region.bounds.y(), | 753 region.bounds.y(), |
751 region.bounds.right(), | 754 region.bounds.right(), |
752 region.bounds.bottom(), | 755 region.bounds.bottom(), |
753 region.draggable ? SkRegion::kUnion_Op : SkRegion::kDifference_Op); | 756 region.draggable ? SkRegion::kUnion_Op : SkRegion::kDifference_Op); |
754 } | 757 } |
755 return sk_region; | 758 return sk_region; |
756 } | 759 } |
757 | 760 |
758 } // namespace apps | 761 } // namespace apps |
OLD | NEW |