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

Side by Side Diff: chrome/browser/ui/webui/net_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/net_internals_ui.h" 5 #include "chrome/browser/ui/webui/net_internals_ui.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <list> 8 #include <list>
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
(...skipping 1485 matching lines...) Expand 10 before | Expand all | Expand 10 after
1496 dict->SetString("name", version_info.Name()); 1496 dict->SetString("name", version_info.Name());
1497 dict->SetString("version", version_info.Version()); 1497 dict->SetString("version", version_info.Version());
1498 dict->SetString("cl", version_info.LastChange()); 1498 dict->SetString("cl", version_info.LastChange());
1499 dict->SetString("version_mod", 1499 dict->SetString("version_mod",
1500 chrome::VersionInfo::GetVersionStringModifier()); 1500 chrome::VersionInfo::GetVersionStringModifier());
1501 dict->SetString("official", 1501 dict->SetString("official",
1502 version_info.IsOfficialBuild() ? "official" : 1502 version_info.IsOfficialBuild() ? "official" :
1503 "unofficial"); 1503 "unofficial");
1504 dict->SetString("os_type", version_info.OSType()); 1504 dict->SetString("os_type", version_info.OSType());
1505 dict->SetString("command_line", 1505 dict->SetString("command_line",
1506 CommandLine::ForCurrentProcess()->command_line_string()); 1506 CommandLine::ForCurrentProcess()->GetCommandLineString());
1507 } 1507 }
1508 1508
1509 constants_dict->Set("clientInfo", dict); 1509 constants_dict->Set("clientInfo", dict);
1510 } 1510 }
1511 1511
1512 // Add a dictionary with information about the relationship between load flag 1512 // Add a dictionary with information about the relationship between load flag
1513 // enums and their symbolic names. 1513 // enums and their symbolic names.
1514 { 1514 {
1515 DictionaryValue* dict = new DictionaryValue(); 1515 DictionaryValue* dict = new DictionaryValue();
1516 1516
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
1613 } 1613 }
1614 1614
1615 NetInternalsUI::NetInternalsUI(TabContents* contents) : ChromeWebUI(contents) { 1615 NetInternalsUI::NetInternalsUI(TabContents* contents) : ChromeWebUI(contents) {
1616 AddMessageHandler((new NetInternalsMessageHandler())->Attach(this)); 1616 AddMessageHandler((new NetInternalsMessageHandler())->Attach(this));
1617 1617
1618 NetInternalsHTMLSource* html_source = new NetInternalsHTMLSource(); 1618 NetInternalsHTMLSource* html_source = new NetInternalsHTMLSource();
1619 1619
1620 // Set up the chrome://net-internals/ source. 1620 // Set up the chrome://net-internals/ source.
1621 GetProfile()->GetChromeURLDataManager()->AddDataSource(html_source); 1621 GetProfile()->GetChromeURLDataManager()->AddDataSource(html_source);
1622 } 1622 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/gpu_internals_ui.cc ('k') | chrome/browser/ui/webui/options/about_page_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698