diff options
author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-23 20:09:21 +0000 |
---|---|---|
committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-23 20:09:21 +0000 |
commit | 4747caf2e94287e3bc0974a619cbb5b03c799de3 (patch) | |
tree | 94186d3c6331b98aa759d3d504222151c00c0ca8 /chrome/browser/diagnostics | |
parent | bd3f4b3da8395a6f2fde983f425f3accad36f6ab (diff) | |
download | chromium_src-4747caf2e94287e3bc0974a619cbb5b03c799de3.zip chromium_src-4747caf2e94287e3bc0974a619cbb5b03c799de3.tar.gz chromium_src-4747caf2e94287e3bc0974a619cbb5b03c799de3.tar.bz2 |
Remove the check for inspector files since they're in resources.pak now.
In r79038, I moved the inspector files into resources.pak so we no longer
need to check to see if inspector is available (it should always be
there).
Also fix chrome --diagnostics to check for resources.pak rather
than the resources/Inspector dir.
BUG=77167
TEST=Delete resources/inspector from disk, start chrome and right click on a
page. Inspect Element should be there and work.
Review URL: http://codereview.chromium.org/6726027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79170 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/diagnostics')
-rw-r--r-- | chrome/browser/diagnostics/diagnostics_model.cc | 6 | ||||
-rw-r--r-- | chrome/browser/diagnostics/recon_diagnostics.cc | 6 | ||||
-rw-r--r-- | chrome/browser/diagnostics/recon_diagnostics.h | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/chrome/browser/diagnostics/diagnostics_model.cc b/chrome/browser/diagnostics/diagnostics_model.cc index 209e342..b3ff24d 100644 --- a/chrome/browser/diagnostics/diagnostics_model.cc +++ b/chrome/browser/diagnostics/diagnostics_model.cc @@ -89,7 +89,7 @@ class DiagnosticsModelWin : public DiagnosticsModelImpl { tests_.push_back(MakeUserDirTest()); tests_.push_back(MakeLocalStateFileTest()); tests_.push_back(MakeDictonaryDirTest()); - tests_.push_back(MakeInspectorDirTest()); + tests_.push_back(MakeResourcesFileTest()); tests_.push_back(MakeDiskSpaceTest()); tests_.push_back(MakePreferencesTest()); tests_.push_back(MakeLocalStateTest()); @@ -115,7 +115,7 @@ class DiagnosticsModelMac : public DiagnosticsModelImpl { tests_.push_back(MakeUserDirTest()); tests_.push_back(MakeLocalStateFileTest()); tests_.push_back(MakeDictonaryDirTest()); - tests_.push_back(MakeInspectorDirTest()); + tests_.push_back(MakeResourcesFileTest()); tests_.push_back(MakeDiskSpaceTest()); tests_.push_back(MakePreferencesTest()); tests_.push_back(MakeLocalStateTest()); @@ -142,7 +142,7 @@ class DiagnosticsModelPosix : public DiagnosticsModelImpl { tests_.push_back(MakeUserDirTest()); tests_.push_back(MakeLocalStateFileTest()); tests_.push_back(MakeDictonaryDirTest()); - tests_.push_back(MakeInspectorDirTest()); + tests_.push_back(MakeResourcesFileTest()); tests_.push_back(MakeDiskSpaceTest()); tests_.push_back(MakePreferencesTest()); tests_.push_back(MakeLocalStateTest()); diff --git a/chrome/browser/diagnostics/recon_diagnostics.cc b/chrome/browser/diagnostics/recon_diagnostics.cc index 218e85f..60e4bae 100644 --- a/chrome/browser/diagnostics/recon_diagnostics.cc +++ b/chrome/browser/diagnostics/recon_diagnostics.cc @@ -214,8 +214,8 @@ const TestPathInfo kPathsToTest[] = { false, false, true, 500 * kOneKilo}, {"Dictionaries Directory", chrome::DIR_APP_DICTIONARIES, true, true, false, 0}, - {"Inspector Directory", chrome::DIR_INSPECTOR, - true, false, false, 0} + {"Resources file", chrome::FILE_RESOURCES_PACK, + false, false, false, 0} }; // Check that the user's data directory exists and the paths are writable. @@ -386,7 +386,7 @@ DiagnosticTest* MakeDictonaryDirTest() { return new PathTest(kPathsToTest[2]); } -DiagnosticTest* MakeInspectorDirTest() { +DiagnosticTest* MakeResourcesFileTest() { return new PathTest(kPathsToTest[3]); } diff --git a/chrome/browser/diagnostics/recon_diagnostics.h b/chrome/browser/diagnostics/recon_diagnostics.h index 8a20d4d..02b5db3 100644 --- a/chrome/browser/diagnostics/recon_diagnostics.h +++ b/chrome/browser/diagnostics/recon_diagnostics.h @@ -15,7 +15,7 @@ DiagnosticTest* MakeVersionTest(); DiagnosticTest* MakeUserDirTest(); DiagnosticTest* MakeLocalStateFileTest(); DiagnosticTest* MakeDictonaryDirTest(); -DiagnosticTest* MakeInspectorDirTest(); +DiagnosticTest* MakeResourcesFileTest(); DiagnosticTest* MakeDiskSpaceTest(); DiagnosticTest* MakePreferencesTest(); DiagnosticTest* MakeBookMarksTest(); |