OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/tab_contents/tab_contents_view_views.h" | 5 #include "chrome/browser/ui/views/tab_contents/tab_contents_view_views.h" |
6 | 6 |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include "base/time.h" | 9 #include "base/time.h" |
10 #include "chrome/browser/ui/views/sad_tab_view.h" | 10 #include "chrome/browser/ui/views/sad_tab_view.h" |
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
105 *out = GetClientAreaScreenBounds(); | 105 *out = GetClientAreaScreenBounds(); |
106 } | 106 } |
107 | 107 |
108 void TabContentsViewViews::StartDragging(const WebDropData& drop_data, | 108 void TabContentsViewViews::StartDragging(const WebDropData& drop_data, |
109 WebDragOperationsMask ops, | 109 WebDragOperationsMask ops, |
110 const SkBitmap& image, | 110 const SkBitmap& image, |
111 const gfx::Point& image_offset) { | 111 const gfx::Point& image_offset) { |
112 native_tab_contents_view_->StartDragging(drop_data, ops, image, image_offset); | 112 native_tab_contents_view_->StartDragging(drop_data, ops, image, image_offset); |
113 } | 113 } |
114 | 114 |
115 void TabContentsViewViews::SetPageTitle(const std::wstring& title) { | 115 void TabContentsViewViews::SetPageTitle(const string16& title) { |
116 native_tab_contents_view_->SetPageTitle(title); | 116 native_tab_contents_view_->SetPageTitle(title); |
117 } | 117 } |
118 | 118 |
119 void TabContentsViewViews::OnTabCrashed(base::TerminationStatus status, | 119 void TabContentsViewViews::OnTabCrashed(base::TerminationStatus status, |
120 int /* error_code */) { | 120 int /* error_code */) { |
121 // Force an invalidation to render sad tab. | 121 // Force an invalidation to render sad tab. |
122 // Note that it's possible to get this message after the window was destroyed. | 122 // Note that it's possible to get this message after the window was destroyed. |
123 if (GetNativeView()) { | 123 if (GetNativeView()) { |
124 SadTabView::Kind kind = | 124 SadTabView::Kind kind = |
125 status == base::TERMINATION_STATUS_PROCESS_WAS_KILLED ? | 125 status == base::TERMINATION_STATUS_PROCESS_WAS_KILLED ? |
(...skipping 278 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
404 focus_manager_ = NULL; | 404 focus_manager_ = NULL; |
405 return focus_manager; | 405 return focus_manager; |
406 } | 406 } |
407 // TODO(jcampan): we should DCHECK on focus_manager_, as it should not be | 407 // TODO(jcampan): we should DCHECK on focus_manager_, as it should not be |
408 // NULL. We are not doing it as it breaks some unit-tests. We should | 408 // NULL. We are not doing it as it breaks some unit-tests. We should |
409 // probably have an empty TabContentView implementation for the unit-tests, | 409 // probably have an empty TabContentView implementation for the unit-tests, |
410 // that would prevent that code being executed in the unit-test case. | 410 // that would prevent that code being executed in the unit-test case. |
411 // DCHECK(focus_manager_); | 411 // DCHECK(focus_manager_); |
412 return focus_manager_; | 412 return focus_manager_; |
413 } | 413 } |
OLD | NEW |