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

Side by Side Diff: chrome/browser/hang_monitor/hung_plugin_action.cc

Issue 469993006: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (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 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 <windows.h> 5 #include <windows.h>
6 6
7 #include "chrome/browser/hang_monitor/hung_plugin_action.h" 7 #include "chrome/browser/hang_monitor/hung_plugin_action.h"
8 8
9 #include "base/metrics/histogram.h" 9 #include "base/metrics/histogram.h"
10 #include "base/version.h" 10 #include "base/version.h"
11 #include "chrome/browser/ui/simple_message_box.h" 11 #include "chrome/browser/ui/simple_message_box.h"
12 #include "chrome/common/logging_chrome.h" 12 #include "chrome/common/logging_chrome.h"
13 #include "chrome/grit/generated_resources.h"
13 #include "content/public/browser/plugin_service.h" 14 #include "content/public/browser/plugin_service.h"
14 #include "content/public/common/webplugininfo.h" 15 #include "content/public/common/webplugininfo.h"
15 #include "grit/generated_resources.h"
16 #include "ui/base/l10n/l10n_util.h" 16 #include "ui/base/l10n/l10n_util.h"
17 #include "ui/gfx/win/hwnd_util.h" 17 #include "ui/gfx/win/hwnd_util.h"
18 18
19 namespace { 19 namespace {
20 20
21 const wchar_t kGTalkPluginName[] = L"Google Talk Plugin"; 21 const wchar_t kGTalkPluginName[] = L"Google Talk Plugin";
22 const int kGTalkPluginLogMinVersion = 26; // For version 2.6 and below. 22 const int kGTalkPluginLogMinVersion = 26; // For version 2.6 and below.
23 23
24 enum GTalkPluginLogVersion { 24 enum GTalkPluginLogVersion {
25 GTALK_PLUGIN_VERSION_MIN = 0, 25 GTALK_PLUGIN_VERSION_MIN = 0,
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after
200 void CALLBACK HungPluginAction::HungWindowResponseCallback(HWND target_window, 200 void CALLBACK HungPluginAction::HungWindowResponseCallback(HWND target_window,
201 UINT message, 201 UINT message,
202 ULONG_PTR data, 202 ULONG_PTR data,
203 LRESULT result) { 203 LRESULT result) {
204 HungPluginAction* instance = reinterpret_cast<HungPluginAction*>(data); 204 HungPluginAction* instance = reinterpret_cast<HungPluginAction*>(data);
205 DCHECK(NULL != instance); 205 DCHECK(NULL != instance);
206 if (NULL != instance) { 206 if (NULL != instance) {
207 instance->OnWindowResponsive(target_window); 207 instance->OnWindowResponsive(target_window);
208 } 208 }
209 } 209 }
OLDNEW
« no previous file with comments | « chrome/browser/gpu/three_d_api_observer.cc ('k') | chrome/browser/history/chrome_history_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698