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 "content/browser/web_contents/web_contents_impl.h" | 5 #include "content/browser/web_contents/web_contents_impl.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/debug/trace_event.h" | 10 #include "base/debug/trace_event.h" |
(...skipping 2492 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2503 value.year, | 2503 value.year, |
2504 value.month, | 2504 value.month, |
2505 value.day, | 2505 value.day, |
2506 value.hour, | 2506 value.hour, |
2507 value.minute, | 2507 value.minute, |
2508 value.second, | 2508 value.second, |
2509 value.milli, | 2509 value.milli, |
2510 value.week, | 2510 value.week, |
2511 value.minimum, | 2511 value.minimum, |
2512 value.maximum, | 2512 value.maximum, |
2513 value.step); | 2513 value.step, |
| 2514 value.suggestions); |
2514 } | 2515 } |
2515 | 2516 |
2516 #endif | 2517 #endif |
2517 | 2518 |
2518 void WebContentsImpl::OnCrashedPlugin(const base::FilePath& plugin_path, | 2519 void WebContentsImpl::OnCrashedPlugin(const base::FilePath& plugin_path, |
2519 base::ProcessId plugin_pid) { | 2520 base::ProcessId plugin_pid) { |
2520 FOR_EACH_OBSERVER(WebContentsObserver, observers_, | 2521 FOR_EACH_OBSERVER(WebContentsObserver, observers_, |
2521 PluginCrashed(plugin_path, plugin_pid)); | 2522 PluginCrashed(plugin_path, plugin_pid)); |
2522 } | 2523 } |
2523 | 2524 |
(...skipping 1335 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3859 gfx::Size WebContentsImpl::GetSizeForNewRenderView() const { | 3860 gfx::Size WebContentsImpl::GetSizeForNewRenderView() const { |
3860 gfx::Size size; | 3861 gfx::Size size; |
3861 if (delegate_) | 3862 if (delegate_) |
3862 size = delegate_->GetSizeForNewRenderView(this); | 3863 size = delegate_->GetSizeForNewRenderView(this); |
3863 if (size.IsEmpty()) | 3864 if (size.IsEmpty()) |
3864 size = view_->GetContainerSize(); | 3865 size = view_->GetContainerSize(); |
3865 return size; | 3866 return size; |
3866 } | 3867 } |
3867 | 3868 |
3868 } // namespace content | 3869 } // namespace content |
OLD | NEW |