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

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

Issue 196423023: Revert of Include sync.pb.h in sync_data.h. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 9 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 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/json/json_reader.h" 10 #include "base/json/json_reader.h"
11 #include "base/json/json_writer.h" 11 #include "base/json/json_writer.h"
12 #include "base/lazy_instance.h" 12 #include "base/lazy_instance.h"
13 #include "base/metrics/histogram.h" 13 #include "base/metrics/histogram.h"
14 #include "base/prefs/scoped_user_pref_update.h" 14 #include "base/prefs/scoped_user_pref_update.h"
15 #include "base/strings/string_number_conversions.h" 15 #include "base/strings/string_number_conversions.h"
16 #include "base/strings/string_util.h" 16 #include "base/strings/string_util.h"
17 #include "base/strings/utf_string_conversions.h" 17 #include "base/strings/utf_string_conversions.h"
18 #include "base/time/time.h" 18 #include "base/time/time.h"
19 #include "base/values.h" 19 #include "base/values.h"
20 #include "chrome/browser/browser_process.h" 20 #include "chrome/browser/browser_process.h"
21 #include "chrome/browser/chrome_notification_types.h" 21 #include "chrome/browser/chrome_notification_types.h"
22 #include "chrome/browser/chrome_page_zoom.h" 22 #include "chrome/browser/chrome_page_zoom.h"
23 #include "chrome/browser/extensions/api/debugger/debugger_api.h" 23 #include "chrome/browser/extensions/api/debugger/debugger_api.h"
24 #include "chrome/browser/extensions/extension_service.h" 24 #include "chrome/browser/extensions/extension_service.h"
25 #include "chrome/browser/extensions/extension_web_contents_observer.h" 25 #include "chrome/browser/extensions/extension_web_contents_observer.h"
26 #include "chrome/browser/file_select_helper.h" 26 #include "chrome/browser/file_select_helper.h"
27 #include "chrome/browser/infobars/confirm_infobar_delegate.h" 27 #include "chrome/browser/infobars/confirm_infobar_delegate.h"
28 #include "chrome/browser/infobars/infobar.h" 28 #include "chrome/browser/infobars/infobar.h"
29 #include "chrome/browser/prefs/pref_service_syncable.h"
29 #include "chrome/browser/profiles/profile.h" 30 #include "chrome/browser/profiles/profile.h"
30 #include "chrome/browser/sessions/session_tab_helper.h" 31 #include "chrome/browser/sessions/session_tab_helper.h"
31 #include "chrome/browser/themes/theme_properties.h" 32 #include "chrome/browser/themes/theme_properties.h"
32 #include "chrome/browser/themes/theme_service.h" 33 #include "chrome/browser/themes/theme_service.h"
33 #include "chrome/browser/themes/theme_service_factory.h" 34 #include "chrome/browser/themes/theme_service_factory.h"
34 #include "chrome/browser/ui/browser.h" 35 #include "chrome/browser/ui/browser.h"
35 #include "chrome/browser/ui/browser_dialogs.h" 36 #include "chrome/browser/ui/browser_dialogs.h"
36 #include "chrome/browser/ui/browser_iterator.h" 37 #include "chrome/browser/ui/browser_iterator.h"
37 #include "chrome/browser/ui/browser_list.h" 38 #include "chrome/browser/ui/browser_list.h"
38 #include "chrome/browser/ui/browser_window.h" 39 #include "chrome/browser/ui/browser_window.h"
(...skipping 1494 matching lines...) Expand 10 before | Expand all | Expand 10 after
1533 } 1534 }
1534 1535
1535 void DevToolsWindow::SetLoadCompletedCallback(const base::Closure& closure) { 1536 void DevToolsWindow::SetLoadCompletedCallback(const base::Closure& closure) {
1536 if (load_state_ == kLoadCompleted) { 1537 if (load_state_ == kLoadCompleted) {
1537 if (!closure.is_null()) 1538 if (!closure.is_null())
1538 closure.Run(); 1539 closure.Run();
1539 return; 1540 return;
1540 } 1541 }
1541 load_completed_callback_ = closure; 1542 load_completed_callback_ = closure;
1542 } 1543 }
OLDNEW
« no previous file with comments | « chrome/browser/devtools/adb/android_rsa.cc ('k') | chrome/browser/extensions/extension_disabled_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698