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

Side by Side Diff: chrome/browser/ui/browser_list.cc

Issue 9838085: Move files inside chrome/browser/chromeos/dbus to chromeos/dbus (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebase Created 8 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/browser_list.h" 5 #include "chrome/browser/ui/browser_list.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/message_loop.h" 9 #include "base/message_loop.h"
10 #include "base/metrics/histogram.h" 10 #include "base/metrics/histogram.h"
(...skipping 19 matching lines...) Expand all
30 #include "content/public/browser/render_process_host.h" 30 #include "content/public/browser/render_process_host.h"
31 #include "content/public/common/result_codes.h" 31 #include "content/public/common/result_codes.h"
32 32
33 #if defined(OS_MACOSX) 33 #if defined(OS_MACOSX)
34 #include "chrome/browser/chrome_browser_application_mac.h" 34 #include "chrome/browser/chrome_browser_application_mac.h"
35 #endif 35 #endif
36 36
37 #if defined(OS_CHROMEOS) 37 #if defined(OS_CHROMEOS)
38 #include "base/chromeos/chromeos_version.h" 38 #include "base/chromeos/chromeos_version.h"
39 #include "chrome/browser/chromeos/boot_times_loader.h" 39 #include "chrome/browser/chromeos/boot_times_loader.h"
40 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
41 #include "chrome/browser/chromeos/dbus/session_manager_client.h"
42 #include "chrome/browser/chromeos/dbus/update_engine_client.h"
43 #include "chrome/browser/chromeos/login/user_manager.h" 40 #include "chrome/browser/chromeos/login/user_manager.h"
41 #include "chromeos/dbus/dbus_thread_manager.h"
42 #include "chromeos/dbus/session_manager_client.h"
43 #include "chromeos/dbus/update_engine_client.h"
44 #endif 44 #endif
45 45
46 using content::WebContents; 46 using content::WebContents;
47 47
48 namespace { 48 namespace {
49 49
50 // This object is instantiated when the first Browser object is added to the 50 // This object is instantiated when the first Browser object is added to the
51 // list and delete when the last one is removed. It watches for loads and 51 // list and delete when the last one is removed. It watches for loads and
52 // creates histograms of some global object counts. 52 // creates histograms of some global object counts.
53 class BrowserActivityObserver : public content::NotificationObserver { 53 class BrowserActivityObserver : public content::NotificationObserver {
(...skipping 825 matching lines...) Expand 10 before | Expand all | Expand 10 after
879 // If no more TabContents from Browsers, check the BackgroundPrintingManager. 879 // If no more TabContents from Browsers, check the BackgroundPrintingManager.
880 while (bg_printing_iterator_ != GetBackgroundPrintingManager()->end()) { 880 while (bg_printing_iterator_ != GetBackgroundPrintingManager()->end()) {
881 cur_ = *bg_printing_iterator_; 881 cur_ = *bg_printing_iterator_;
882 CHECK(cur_); 882 CHECK(cur_);
883 ++bg_printing_iterator_; 883 ++bg_printing_iterator_;
884 return; 884 return;
885 } 885 }
886 // Reached the end - no more TabContents. 886 // Reached the end - no more TabContents.
887 cur_ = NULL; 887 cur_ = NULL;
888 } 888 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser_init.cc ('k') | chrome/browser/ui/views/ash/brightness_controller_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698