OLD | NEW |
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 "base/command_line.h" | 5 #include "base/command_line.h" |
6 #include "base/json/json_writer.h" | 6 #include "base/json/json_writer.h" |
7 #include "base/string_number_conversions.h" | 7 #include "base/string_number_conversions.h" |
8 #include "base/utf_string_conversions.h" | 8 #include "base/utf_string_conversions.h" |
9 #include "base/values.h" | 9 #include "base/values.h" |
10 #include "chrome/browser/browser_list.h" | 10 #include "chrome/browser/browser_list.h" |
11 #include "chrome/browser/browser_process.h" | 11 #include "chrome/browser/browser_process.h" |
12 #include "chrome/browser/browser_window.h" | 12 #include "chrome/browser/browser_window.h" |
13 #include "chrome/browser/debugger/devtools_manager.h" | 13 #include "chrome/browser/debugger/devtools_manager.h" |
14 #include "chrome/browser/debugger/devtools_window.h" | 14 #include "chrome/browser/debugger/devtools_window.h" |
15 #include "chrome/browser/extensions/extension_service.h" | 15 #include "chrome/browser/extensions/extension_service.h" |
16 #include "chrome/browser/load_notification_details.h" | 16 #include "chrome/browser/load_notification_details.h" |
17 #include "chrome/browser/prefs/pref_service.h" | 17 #include "chrome/browser/prefs/pref_service.h" |
| 18 #include "chrome/browser/prefs/scoped_user_pref_update.h" |
18 #include "chrome/browser/profiles/profile.h" | 19 #include "chrome/browser/profiles/profile.h" |
19 #include "chrome/browser/tabs/tab_strip_model.h" | 20 #include "chrome/browser/tabs/tab_strip_model.h" |
20 #include "chrome/browser/themes/theme_service.h" | 21 #include "chrome/browser/themes/theme_service.h" |
21 #include "chrome/browser/themes/theme_service_factory.h" | 22 #include "chrome/browser/themes/theme_service_factory.h" |
22 #include "chrome/browser/ui/browser.h" | 23 #include "chrome/browser/ui/browser.h" |
23 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" | 24 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" |
24 #include "chrome/common/bindings_policy.h" | 25 #include "chrome/common/bindings_policy.h" |
25 #include "chrome/common/pref_names.h" | 26 #include "chrome/common/pref_names.h" |
26 #include "chrome/common/render_messages.h" | 27 #include "chrome/common/render_messages.h" |
27 #include "chrome/common/url_constants.h" | 28 #include "chrome/common/url_constants.h" |
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
223 wp_key.append(prefs::kBrowserWindowPlacement); | 224 wp_key.append(prefs::kBrowserWindowPlacement); |
224 wp_key.append("_"); | 225 wp_key.append("_"); |
225 wp_key.append(kDevToolsApp); | 226 wp_key.append(kDevToolsApp); |
226 | 227 |
227 PrefService* prefs = profile_->GetPrefs(); | 228 PrefService* prefs = profile_->GetPrefs(); |
228 if (!prefs->FindPreference(wp_key.c_str())) { | 229 if (!prefs->FindPreference(wp_key.c_str())) { |
229 prefs->RegisterDictionaryPref(wp_key.c_str()); | 230 prefs->RegisterDictionaryPref(wp_key.c_str()); |
230 } | 231 } |
231 | 232 |
232 const DictionaryValue* wp_pref = prefs->GetDictionary(wp_key.c_str()); | 233 const DictionaryValue* wp_pref = prefs->GetDictionary(wp_key.c_str()); |
233 if (!wp_pref) { | 234 if (!wp_pref || wp_pref->empty()) { |
234 DictionaryValue* defaults = prefs->GetMutableDictionary(wp_key.c_str()); | 235 DictionaryPrefUpdate update(prefs, wp_key.c_str()); |
| 236 DictionaryValue* defaults = update.Get(); |
235 defaults->SetInteger("left", 100); | 237 defaults->SetInteger("left", 100); |
236 defaults->SetInteger("top", 100); | 238 defaults->SetInteger("top", 100); |
237 defaults->SetInteger("right", 740); | 239 defaults->SetInteger("right", 740); |
238 defaults->SetInteger("bottom", 740); | 240 defaults->SetInteger("bottom", 740); |
239 defaults->SetBoolean("maximized", false); | 241 defaults->SetBoolean("maximized", false); |
240 defaults->SetBoolean("always_on_top", false); | 242 defaults->SetBoolean("always_on_top", false); |
241 } | 243 } |
242 | 244 |
243 browser_ = Browser::CreateForDevTools(profile_); | 245 browser_ = Browser::CreateForDevTools(profile_); |
244 browser_->tabstrip_model()->AddTabContents( | 246 browser_->tabstrip_model()->AddTabContents( |
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
439 return false; | 441 return false; |
440 } | 442 } |
441 | 443 |
442 void DevToolsWindow::HandleKeyboardEvent(const NativeWebKeyboardEvent& event) { | 444 void DevToolsWindow::HandleKeyboardEvent(const NativeWebKeyboardEvent& event) { |
443 if (docked_) { | 445 if (docked_) { |
444 BrowserWindow* inspected_window = GetInspectedBrowserWindow(); | 446 BrowserWindow* inspected_window = GetInspectedBrowserWindow(); |
445 if (inspected_window) | 447 if (inspected_window) |
446 inspected_window->HandleKeyboardEvent(event); | 448 inspected_window->HandleKeyboardEvent(event); |
447 } | 449 } |
448 } | 450 } |
OLD | NEW |