| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "extensions/browser/app_window/app_window.h" | 5 #include "extensions/browser/app_window/app_window.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 869 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 880 | 880 |
| 881 if (CommandLine::ForCurrentProcess()->HasSwitch(::switches::kTestType)) { | 881 if (CommandLine::ForCurrentProcess()->HasSwitch(::switches::kTestType)) { |
| 882 app_window_contents_->DispatchWindowShownForTests(); | 882 app_window_contents_->DispatchWindowShownForTests(); |
| 883 } | 883 } |
| 884 } | 884 } |
| 885 | 885 |
| 886 void AppWindow::CloseContents(WebContents* contents) { | 886 void AppWindow::CloseContents(WebContents* contents) { |
| 887 native_app_window_->Close(); | 887 native_app_window_->Close(); |
| 888 } | 888 } |
| 889 | 889 |
| 890 bool AppWindow::ShouldSuppressDialogs() { return true; } | 890 bool AppWindow::ShouldSuppressDialogs(WebContents* source) { |
| 891 return true; |
| 892 } |
| 891 | 893 |
| 892 content::ColorChooser* AppWindow::OpenColorChooser( | 894 content::ColorChooser* AppWindow::OpenColorChooser( |
| 893 WebContents* web_contents, | 895 WebContents* web_contents, |
| 894 SkColor initial_color, | 896 SkColor initial_color, |
| 895 const std::vector<content::ColorSuggestion>& suggestions) { | 897 const std::vector<content::ColorSuggestion>& suggestions) { |
| 896 return app_delegate_->ShowColorChooser(web_contents, initial_color); | 898 return app_delegate_->ShowColorChooser(web_contents, initial_color); |
| 897 } | 899 } |
| 898 | 900 |
| 899 void AppWindow::RunFileChooser(WebContents* tab, | 901 void AppWindow::RunFileChooser(WebContents* tab, |
| 900 const content::FileChooserParams& params) { | 902 const content::FileChooserParams& params) { |
| (...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1089 region.bounds.x(), | 1091 region.bounds.x(), |
| 1090 region.bounds.y(), | 1092 region.bounds.y(), |
| 1091 region.bounds.right(), | 1093 region.bounds.right(), |
| 1092 region.bounds.bottom(), | 1094 region.bounds.bottom(), |
| 1093 region.draggable ? SkRegion::kUnion_Op : SkRegion::kDifference_Op); | 1095 region.draggable ? SkRegion::kUnion_Op : SkRegion::kDifference_Op); |
| 1094 } | 1096 } |
| 1095 return sk_region; | 1097 return sk_region; |
| 1096 } | 1098 } |
| 1097 | 1099 |
| 1098 } // namespace extensions | 1100 } // namespace extensions |
| OLD | NEW |