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

Side by Side Diff: chrome/browser/ui/webui/gpu_internals_ui.cc

Issue 7386002: Rename CommandLine::GetCommandLineString(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge. Created 9 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/gpu_internals_ui.h" 5 #include "chrome/browser/ui/webui/gpu_internals_ui.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 449 matching lines...) Expand 10 before | Expand all | Expand 10 after
460 dict->SetString("cl", version_info.LastChange()); 460 dict->SetString("cl", version_info.LastChange());
461 dict->SetString("version_mod", 461 dict->SetString("version_mod",
462 chrome::VersionInfo::GetVersionStringModifier()); 462 chrome::VersionInfo::GetVersionStringModifier());
463 dict->SetString("official", 463 dict->SetString("official",
464 l10n_util::GetStringUTF16( 464 l10n_util::GetStringUTF16(
465 version_info.IsOfficialBuild() ? 465 version_info.IsOfficialBuild() ?
466 IDS_ABOUT_VERSION_OFFICIAL : 466 IDS_ABOUT_VERSION_OFFICIAL :
467 IDS_ABOUT_VERSION_UNOFFICIAL)); 467 IDS_ABOUT_VERSION_UNOFFICIAL));
468 468
469 dict->SetString("command_line", 469 dict->SetString("command_line",
470 CommandLine::ForCurrentProcess()->command_line_string()); 470 CommandLine::ForCurrentProcess()->GetCommandLineString());
471 } 471 }
472 472
473 dict->SetString("blacklist_version", 473 dict->SetString("blacklist_version",
474 GpuDataManager::GetInstance()->GetBlacklistVersion()); 474 GpuDataManager::GetInstance()->GetBlacklistVersion());
475 475
476 return dict; 476 return dict;
477 } 477 }
478 478
479 DictionaryValue* NewDescriptionValuePair(const std::string& desc, 479 DictionaryValue* NewDescriptionValuePair(const std::string& desc,
480 const std::string& value) { 480 const std::string& value) {
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after
641 //////////////////////////////////////////////////////////////////////////////// 641 ////////////////////////////////////////////////////////////////////////////////
642 642
643 GpuInternalsUI::GpuInternalsUI(TabContents* contents) : ChromeWebUI(contents) { 643 GpuInternalsUI::GpuInternalsUI(TabContents* contents) : ChromeWebUI(contents) {
644 AddMessageHandler((new GpuMessageHandler())->Attach(this)); 644 AddMessageHandler((new GpuMessageHandler())->Attach(this));
645 645
646 GpuHTMLSource* html_source = new GpuHTMLSource(); 646 GpuHTMLSource* html_source = new GpuHTMLSource();
647 647
648 // Set up the chrome://gpu/ source. 648 // Set up the chrome://gpu/ source.
649 contents->profile()->GetChromeURLDataManager()->AddDataSource(html_source); 649 contents->profile()->GetChromeURLDataManager()->AddDataSource(html_source);
650 } 650 }
OLDNEW
« no previous file with comments | « chrome/browser/safe_browsing/safe_browsing_test.cc ('k') | chrome/browser/ui/webui/net_internals_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698