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

Side by Side Diff: chrome/browser/ui/webui/version_handler.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, 3 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
« no previous file with comments | « chrome/browser/ui/webui/uber/uber_ui.cc ('k') | chrome/browser/ui/webui/version_ui.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "chrome/browser/ui/webui/version_handler.h" 5 #include "chrome/browser/ui/webui/version_handler.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/files/file_util.h" 8 #include "base/files/file_util.h"
9 #include "base/metrics/field_trial.h" 9 #include "base/metrics/field_trial.h"
10 #include "base/strings/string_util.h" 10 #include "base/strings/string_util.h"
11 #include "base/strings/utf_string_conversions.h" 11 #include "base/strings/utf_string_conversions.h"
12 #include "chrome/browser/plugins/plugin_prefs.h" 12 #include "chrome/browser/plugins/plugin_prefs.h"
13 #include "chrome/browser/profiles/profile.h" 13 #include "chrome/browser/profiles/profile.h"
14 #include "chrome/grit/generated_resources.h"
14 #include "components/variations/active_field_trials.h" 15 #include "components/variations/active_field_trials.h"
15 #include "content/public/browser/browser_thread.h" 16 #include "content/public/browser/browser_thread.h"
16 #include "content/public/browser/plugin_service.h" 17 #include "content/public/browser/plugin_service.h"
17 #include "content/public/browser/web_ui.h" 18 #include "content/public/browser/web_ui.h"
18 #include "content/public/common/content_constants.h" 19 #include "content/public/common/content_constants.h"
19 #include "grit/generated_resources.h"
20 #include "ui/base/l10n/l10n_util.h" 20 #include "ui/base/l10n/l10n_util.h"
21 #include "url/gurl.h" 21 #include "url/gurl.h"
22 22
23 namespace { 23 namespace {
24 24
25 // Retrieves the executable and profile paths on the FILE thread. 25 // Retrieves the executable and profile paths on the FILE thread.
26 void GetFilePaths(const base::FilePath& profile_path, 26 void GetFilePaths(const base::FilePath& profile_path,
27 base::string16* exec_path_out, 27 base::string16* exec_path_out,
28 base::string16* profile_path_out) { 28 base::string16* profile_path_out) {
29 DCHECK_CURRENTLY_ON(content::BrowserThread::FILE); 29 DCHECK_CURRENTLY_ON(content::BrowserThread::FILE);
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 flash_version = info_array[i].version; 141 flash_version = info_array[i].version;
142 break; 142 break;
143 } 143 }
144 } 144 }
145 } 145 }
146 146
147 base::StringValue arg(flash_version); 147 base::StringValue arg(flash_version);
148 web_ui()->CallJavascriptFunction("returnFlashVersion", arg); 148 web_ui()->CallJavascriptFunction("returnFlashVersion", arg);
149 } 149 }
150 #endif // defined(ENABLE_PLUGINS) 150 #endif // defined(ENABLE_PLUGINS)
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/uber/uber_ui.cc ('k') | chrome/browser/ui/webui/version_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698