Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(968)

Side by Side Diff: ash/screensaver/screensaver_view.cc

Issue 18339006: Rename RenderViewGone IPC/methods to better reflect reality (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixes for reviews by creis@ and palmer@. Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 "ash/screensaver/screensaver_view.h" 5 #include "ash/screensaver/screensaver_view.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/shell_delegate.h" 8 #include "ash/shell_delegate.h"
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 } 73 }
74 74
75 //////////////////////////////////////////////////////////////////////////////// 75 ////////////////////////////////////////////////////////////////////////////////
76 // ScreensaverView, views::WidgetDelegateView implementation. 76 // ScreensaverView, views::WidgetDelegateView implementation.
77 views::View* ScreensaverView::GetContentsView() { 77 views::View* ScreensaverView::GetContentsView() {
78 return this; 78 return this;
79 } 79 }
80 80
81 //////////////////////////////////////////////////////////////////////////////// 81 ////////////////////////////////////////////////////////////////////////////////
82 // ScreensaverView, content::WebContentsObserver implementation. 82 // ScreensaverView, content::WebContentsObserver implementation.
83 void ScreensaverView::RenderViewGone( 83 void ScreensaverView::RenderProcessGone(
84 base::TerminationStatus status) { 84 base::TerminationStatus status) {
85 LOG(ERROR) << "Screensaver terminated with status " << status; 85 LOG(ERROR) << "Screensaver terminated with status " << status;
86 termination_count_++; 86 termination_count_++;
87 87
88 if (termination_count_ < kMaxTerminations) { 88 if (termination_count_ < kMaxTerminations) {
89 LOG(ERROR) << termination_count_ 89 LOG(ERROR) << termination_count_
90 << " terminations is under the threshold of " 90 << " terminations is under the threshold of "
91 << kMaxTerminations 91 << kMaxTerminations
92 << "; reloading Screensaver."; 92 << "; reloading Screensaver.";
93 LoadScreensaver(); 93 LoadScreensaver();
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 container_window_->Show(); 161 container_window_->Show();
162 } 162 }
163 163
164 // static 164 // static
165 ScreensaverView* ScreensaverView::GetInstance() { 165 ScreensaverView* ScreensaverView::GetInstance() {
166 return g_instance; 166 return g_instance;
167 } 167 }
168 168
169 } // namespace internal 169 } // namespace internal
170 } // namespace ash 170 } // namespace ash
OLDNEW
« no previous file with comments | « ash/screensaver/screensaver_view.h ('k') | chrome/browser/chromeos/login/login_display_host_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698