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

Side by Side Diff: chrome/browser/devtools/devtools_window.cc

Issue 2806283002: Revert of Stop passing raw pointers to base::Value API in c/b/chromeos and c/b/extensions (Closed)
Patch Set: Created 3 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/devtools/devtools_window.h" 5 #include "chrome/browser/devtools/devtools_window.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <utility>
9 8
10 #include "base/command_line.h" 9 #include "base/command_line.h"
11 #include "base/json/json_reader.h" 10 #include "base/json/json_reader.h"
12 #include "base/macros.h" 11 #include "base/macros.h"
13 #include "base/memory/ptr_util.h"
14 #include "base/metrics/histogram_macros.h" 12 #include "base/metrics/histogram_macros.h"
15 #include "base/metrics/user_metrics.h" 13 #include "base/metrics/user_metrics.h"
16 #include "base/time/time.h" 14 #include "base/time/time.h"
17 #include "base/values.h" 15 #include "base/values.h"
18 #include "chrome/browser/certificate_viewer.h" 16 #include "chrome/browser/certificate_viewer.h"
19 #include "chrome/browser/data_use_measurement/data_use_web_contents_observer.h" 17 #include "chrome/browser/data_use_measurement/data_use_web_contents_observer.h"
20 #include "chrome/browser/file_select_helper.h" 18 #include "chrome/browser/file_select_helper.h"
21 #include "chrome/browser/infobars/infobar_service.h" 19 #include "chrome/browser/infobars/infobar_service.h"
22 #include "chrome/browser/profiles/profile.h" 20 #include "chrome/browser/profiles/profile.h"
23 #include "chrome/browser/sessions/session_tab_helper.h" 21 #include "chrome/browser/sessions/session_tab_helper.h"
(...skipping 1278 matching lines...) Expand 10 before | Expand all | Expand 10 after
1302 ready_for_test_callback_.Run(); 1300 ready_for_test_callback_.Run();
1303 ready_for_test_callback_ = base::Closure(); 1301 ready_for_test_callback_ = base::Closure();
1304 } 1302 }
1305 } 1303 }
1306 1304
1307 void DevToolsWindow::CreateDevToolsBrowser() { 1305 void DevToolsWindow::CreateDevToolsBrowser() {
1308 PrefService* prefs = profile_->GetPrefs(); 1306 PrefService* prefs = profile_->GetPrefs();
1309 if (!prefs->GetDictionary(prefs::kAppWindowPlacement)->HasKey(kDevToolsApp)) { 1307 if (!prefs->GetDictionary(prefs::kAppWindowPlacement)->HasKey(kDevToolsApp)) {
1310 DictionaryPrefUpdate update(prefs, prefs::kAppWindowPlacement); 1308 DictionaryPrefUpdate update(prefs, prefs::kAppWindowPlacement);
1311 base::DictionaryValue* wp_prefs = update.Get(); 1309 base::DictionaryValue* wp_prefs = update.Get();
1312 auto dev_tools_defaults = base::MakeUnique<base::DictionaryValue>(); 1310 base::DictionaryValue* dev_tools_defaults = new base::DictionaryValue;
1311 wp_prefs->Set(kDevToolsApp, dev_tools_defaults);
1313 dev_tools_defaults->SetInteger("left", 100); 1312 dev_tools_defaults->SetInteger("left", 100);
1314 dev_tools_defaults->SetInteger("top", 100); 1313 dev_tools_defaults->SetInteger("top", 100);
1315 dev_tools_defaults->SetInteger("right", 740); 1314 dev_tools_defaults->SetInteger("right", 740);
1316 dev_tools_defaults->SetInteger("bottom", 740); 1315 dev_tools_defaults->SetInteger("bottom", 740);
1317 dev_tools_defaults->SetBoolean("maximized", false); 1316 dev_tools_defaults->SetBoolean("maximized", false);
1318 dev_tools_defaults->SetBoolean("always_on_top", false); 1317 dev_tools_defaults->SetBoolean("always_on_top", false);
1319 wp_prefs->Set(kDevToolsApp, std::move(dev_tools_defaults));
1320 } 1318 }
1321 1319
1322 browser_ = new Browser(Browser::CreateParams::CreateForDevTools(profile_)); 1320 browser_ = new Browser(Browser::CreateParams::CreateForDevTools(profile_));
1323 browser_->tab_strip_model()->AddWebContents( 1321 browser_->tab_strip_model()->AddWebContents(
1324 main_web_contents_, -1, ui::PAGE_TRANSITION_AUTO_TOPLEVEL, 1322 main_web_contents_, -1, ui::PAGE_TRANSITION_AUTO_TOPLEVEL,
1325 TabStripModel::ADD_ACTIVE); 1323 TabStripModel::ADD_ACTIVE);
1326 main_web_contents_->GetRenderViewHost()->SyncRendererPrefs(); 1324 main_web_contents_->GetRenderViewHost()->SyncRendererPrefs();
1327 } 1325 }
1328 1326
1329 BrowserWindow* DevToolsWindow::GetInspectedBrowserWindow() { 1327 BrowserWindow* DevToolsWindow::GetInspectedBrowserWindow() {
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
1409 bool DevToolsWindow::ReloadInspectedWebContents(bool bypass_cache) { 1407 bool DevToolsWindow::ReloadInspectedWebContents(bool bypass_cache) {
1410 // Only route reload via front-end if the agent is attached. 1408 // Only route reload via front-end if the agent is attached.
1411 WebContents* wc = GetInspectedWebContents(); 1409 WebContents* wc = GetInspectedWebContents();
1412 if (!wc || wc->GetCrashedStatus() != base::TERMINATION_STATUS_STILL_RUNNING) 1410 if (!wc || wc->GetCrashedStatus() != base::TERMINATION_STATUS_STILL_RUNNING)
1413 return false; 1411 return false;
1414 base::Value bypass_cache_value(bypass_cache); 1412 base::Value bypass_cache_value(bypass_cache);
1415 bindings_->CallClientFunction("DevToolsAPI.reloadInspectedPage", 1413 bindings_->CallClientFunction("DevToolsAPI.reloadInspectedPage",
1416 &bypass_cache_value, nullptr, nullptr); 1414 &bypass_cache_value, nullptr, nullptr);
1417 return true; 1415 return true;
1418 } 1416 }
OLDNEW
« no previous file with comments | « chrome/browser/devtools/devtools_ui_bindings.cc ('k') | chrome/browser/extensions/activity_log/activity_log.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698