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

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

Issue 1100223002: Update {virtual,override} to follow C++11 style in chrome. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 8 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
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/profiler_ui.h" 5 #include "chrome/browser/ui/webui/profiler_ui.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 // When testing the javacript code, it is cumbersome to have to keep 9 // When testing the javacript code, it is cumbersome to have to keep
10 // re-building the resouces package and reloading the browser. To solve 10 // re-building the resouces package and reloading the browser. To solve
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 46
47 #ifdef USE_SOURCE_FILES_DIRECTLY 47 #ifdef USE_SOURCE_FILES_DIRECTLY
48 48
49 class ProfilerWebUIDataSource : public content::URLDataSource { 49 class ProfilerWebUIDataSource : public content::URLDataSource {
50 public: 50 public:
51 ProfilerWebUIDataSource() { 51 ProfilerWebUIDataSource() {
52 } 52 }
53 53
54 protected: 54 protected:
55 // content::URLDataSource implementation. 55 // content::URLDataSource implementation.
56 virtual std::string GetSource() override { 56 std::string GetSource() override {
57 return chrome::kChromeUIProfilerHost; 57 return chrome::kChromeUIProfilerHost;
58 } 58 }
59 59
60 virtual std::string GetMimeType(const std::string& path) const override { 60 std::string GetMimeType(const std::string& path) const override {
61 if (EndsWith(path, ".js", false)) 61 if (EndsWith(path, ".js", false))
62 return "application/javascript"; 62 return "application/javascript";
63 return "text/html"; 63 return "text/html";
64 } 64 }
65 65
66 virtual void StartDataRequest( 66 void StartDataRequest(
67 const std::string& path, 67 const std::string& path,
68 bool is_incognito, 68 bool is_incognito,
69 const content::URLDataSource::GotDataCallback& callback) override { 69 const content::URLDataSource::GotDataCallback& callback) override {
70 base::FilePath base_path; 70 base::FilePath base_path;
71 PathService::Get(base::DIR_SOURCE_ROOT, &base_path); 71 PathService::Get(base::DIR_SOURCE_ROOT, &base_path);
72 base_path = base_path.AppendASCII("chrome"); 72 base_path = base_path.AppendASCII("chrome");
73 base_path = base_path.AppendASCII("browser"); 73 base_path = base_path.AppendASCII("browser");
74 base_path = base_path.AppendASCII("resources"); 74 base_path = base_path.AppendASCII("resources");
75 base_path = base_path.AppendASCII("profiler"); 75 base_path = base_path.AppendASCII("profiler");
76 76
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
171 base::TimeDelta phase_finish, 171 base::TimeDelta phase_finish,
172 const metrics::ProfilerEvents& past_events) { 172 const metrics::ProfilerEvents& past_events) {
173 // Serialize the data to JSON. 173 // Serialize the data to JSON.
174 base::DictionaryValue json_data; 174 base::DictionaryValue json_data;
175 task_profiler::TaskProfilerDataSerializer::ToValue( 175 task_profiler::TaskProfilerDataSerializer::ToValue(
176 process_data_phase, process_id, process_type, &json_data); 176 process_data_phase, process_id, process_type, &json_data);
177 177
178 // Send the data to the renderer. 178 // Send the data to the renderer.
179 web_ui()->CallJavascriptFunction("g_browserBridge.receivedData", json_data); 179 web_ui()->CallJavascriptFunction("g_browserBridge.receivedData", json_data);
180 } 180 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/options/preferences_browsertest.h ('k') | chrome/browser/ui/webui/set_as_default_browser_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698