OLD | NEW |
1 // Copyright (c) 2010 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" |
(...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
214 return tab_contents_->render_view_host(); | 214 return tab_contents_->render_view_host(); |
215 } | 215 } |
216 | 216 |
217 void DevToolsWindow::CreateDevToolsBrowser() { | 217 void DevToolsWindow::CreateDevToolsBrowser() { |
218 // TODO(pfeldman): Make browser's getter for this key static. | 218 // TODO(pfeldman): Make browser's getter for this key static. |
219 std::string wp_key; | 219 std::string wp_key; |
220 wp_key.append(prefs::kBrowserWindowPlacement); | 220 wp_key.append(prefs::kBrowserWindowPlacement); |
221 wp_key.append("_"); | 221 wp_key.append("_"); |
222 wp_key.append(kDevToolsApp); | 222 wp_key.append(kDevToolsApp); |
223 | 223 |
224 PrefService* prefs = g_browser_process->local_state(); | 224 PrefService* prefs = profile_->GetPrefs(); |
225 if (!prefs->FindPreference(wp_key.c_str())) { | 225 if (!prefs->FindPreference(wp_key.c_str())) { |
226 prefs->RegisterDictionaryPref(wp_key.c_str()); | 226 prefs->RegisterDictionaryPref(wp_key.c_str()); |
227 } | 227 } |
228 | 228 |
229 const DictionaryValue* wp_pref = prefs->GetDictionary(wp_key.c_str()); | 229 const DictionaryValue* wp_pref = prefs->GetDictionary(wp_key.c_str()); |
230 if (!wp_pref) { | 230 if (!wp_pref) { |
231 DictionaryValue* defaults = prefs->GetMutableDictionary(wp_key.c_str()); | 231 DictionaryValue* defaults = prefs->GetMutableDictionary(wp_key.c_str()); |
232 defaults->SetInteger("left", 100); | 232 defaults->SetInteger("left", 100); |
233 defaults->SetInteger("top", 100); | 233 defaults->SetInteger("top", 100); |
234 defaults->SetInteger("right", 740); | 234 defaults->SetInteger("right", 740); |
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
427 return false; | 427 return false; |
428 } | 428 } |
429 | 429 |
430 void DevToolsWindow::HandleKeyboardEvent(const NativeWebKeyboardEvent& event) { | 430 void DevToolsWindow::HandleKeyboardEvent(const NativeWebKeyboardEvent& event) { |
431 if (docked_) { | 431 if (docked_) { |
432 BrowserWindow* inspected_window = GetInspectedBrowserWindow(); | 432 BrowserWindow* inspected_window = GetInspectedBrowserWindow(); |
433 if (inspected_window) | 433 if (inspected_window) |
434 inspected_window->HandleKeyboardEvent(event); | 434 inspected_window->HandleKeyboardEvent(event); |
435 } | 435 } |
436 } | 436 } |
OLD | NEW |