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

Unified Diff: chrome/browser/ui/views/hung_renderer_view.cc

Issue 498773003: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (part 2 … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 4 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/hung_renderer_view.cc
diff --git a/chrome/browser/ui/views/hung_renderer_view.cc b/chrome/browser/ui/views/hung_renderer_view.cc
index 575c76969cffdf75f2d3b271f21e1939affedf20..3aa915f355d8f48c8892c1b811938f1e13a9fae8 100644
--- a/chrome/browser/ui/views/hung_renderer_view.cc
+++ b/chrome/browser/ui/views/hung_renderer_view.cc
@@ -17,12 +17,12 @@
#include "chrome/browser/ui/views/constrained_window_views.h"
#include "chrome/common/chrome_constants.h"
#include "chrome/common/logging_chrome.h"
+#include "chrome/grit/generated_resources.h"
#include "components/web_modal/web_contents_modal_dialog_host.h"
#include "content/public/browser/render_process_host.h"
#include "content/public/browser/render_view_host.h"
#include "content/public/browser/web_contents.h"
#include "content/public/common/result_codes.h"
-#include "grit/generated_resources.h"
#include "grit/theme_resources.h"
#include "ui/aura/window.h"
#include "ui/base/l10n/l10n_util.h"
@@ -44,10 +44,6 @@
#include "ui/views/win/hwnd_util.h"
#endif
-#if defined(OS_WIN)
-#include "ui/base/win/shell.h"
-#endif
-
using content::WebContents;
HungRendererDialogView* HungRendererDialogView::g_instance_ = NULL;
@@ -346,7 +342,6 @@ void HungRendererDialogView::ButtonPressed(
views::Button* sender, const ui::Event& event) {
if (sender == kill_button_ &&
hung_pages_table_model_->GetRenderProcessHost()) {
-
base::ProcessHandle process_handle =
hung_pages_table_model_->GetRenderProcessHost()->GetHandle();
« no previous file with comments | « chrome/browser/ui/views/fullscreen_exit_bubble_views.cc ('k') | chrome/browser/ui/views/infobars/infobar_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698