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

Side by Side Diff: chrome/browser/chromeos/ui/app_launch_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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 "chrome/browser/chromeos/ui/app_launch_view.h" 5 #include "chrome/browser/chromeos/ui/app_launch_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 "ash/shell_window_ids.h" 9 #include "ash/shell_window_ids.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 } 91 }
92 92
93 //////////////////////////////////////////////////////////////////////////////// 93 ////////////////////////////////////////////////////////////////////////////////
94 // AppLaunchView, views::WidgetDelegateView implementation. 94 // AppLaunchView, views::WidgetDelegateView implementation.
95 views::View* AppLaunchView::GetContentsView() { 95 views::View* AppLaunchView::GetContentsView() {
96 return this; 96 return this;
97 } 97 }
98 98
99 //////////////////////////////////////////////////////////////////////////////// 99 ////////////////////////////////////////////////////////////////////////////////
100 // AppLaunchView, content::WebContentsObserver implementation. 100 // AppLaunchView, content::WebContentsObserver implementation.
101 void AppLaunchView::RenderViewGone( 101 void AppLaunchView::RenderProcessGone(
102 base::TerminationStatus status) { 102 base::TerminationStatus status) {
103 LOG(ERROR) << "Splash screen terminated with status " << status; 103 LOG(ERROR) << "Splash screen terminated with status " << status;
104 AppLaunchView::CloseAppLaunchSplashScreen(); 104 AppLaunchView::CloseAppLaunchSplashScreen();
105 } 105 }
106 106
107 //////////////////////////////////////////////////////////////////////////////// 107 ////////////////////////////////////////////////////////////////////////////////
108 // AppLaunchView private methods. 108 // AppLaunchView private methods.
109 AppLaunchView::AppLaunchView(const std::string& app_id) 109 AppLaunchView::AppLaunchView(const std::string& app_id)
110 : app_launch_webview_(NULL), 110 : app_launch_webview_(NULL),
111 container_window_(NULL), 111 container_window_(NULL),
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 } 197 }
198 198
199 void AppLaunchView::ShowWindow() { 199 void AppLaunchView::ShowWindow() {
200 DCHECK(container_window_); 200 DCHECK(container_window_);
201 container_window_->Show(); 201 container_window_->Show();
202 } 202 }
203 203
204 } // namespace internal 204 } // namespace internal
205 205
206 } // namespace chromeos 206 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/ui/app_launch_view.h ('k') | chrome/browser/extensions/api/identity/web_auth_flow.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698