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

Side by Side Diff: chrome/browser/app_controller_mac.mm

Issue 2345843003: [Sync] Merge //components/browser_sync into one directory. (Closed)
Patch Set: Address comment + rebase. Created 4 years, 3 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 #import "chrome/browser/app_controller_mac.h" 5 #import "chrome/browser/app_controller_mac.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include "base/auto_reset.h" 9 #include "base/auto_reset.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 #include "chrome/browser/web_applications/web_app_mac.h" 76 #include "chrome/browser/web_applications/web_app_mac.h"
77 #include "chrome/common/chrome_paths_internal.h" 77 #include "chrome/common/chrome_paths_internal.h"
78 #include "chrome/common/chrome_switches.h" 78 #include "chrome/common/chrome_switches.h"
79 #include "chrome/common/cloud_print/cloud_print_class_mac.h" 79 #include "chrome/common/cloud_print/cloud_print_class_mac.h"
80 #include "chrome/common/extensions/extension_constants.h" 80 #include "chrome/common/extensions/extension_constants.h"
81 #include "chrome/common/mac/app_mode_common.h" 81 #include "chrome/common/mac/app_mode_common.h"
82 #include "chrome/common/pref_names.h" 82 #include "chrome/common/pref_names.h"
83 #include "chrome/common/url_constants.h" 83 #include "chrome/common/url_constants.h"
84 #include "chrome/grit/chromium_strings.h" 84 #include "chrome/grit/chromium_strings.h"
85 #include "chrome/grit/generated_resources.h" 85 #include "chrome/grit/generated_resources.h"
86 #include "components/browser_sync/browser/profile_sync_service.h" 86 #include "components/browser_sync/profile_sync_service.h"
87 #include "components/handoff/handoff_manager.h" 87 #include "components/handoff/handoff_manager.h"
88 #include "components/handoff/handoff_utility.h" 88 #include "components/handoff/handoff_utility.h"
89 #include "components/prefs/pref_service.h" 89 #include "components/prefs/pref_service.h"
90 #include "components/sessions/core/tab_restore_service.h" 90 #include "components/sessions/core/tab_restore_service.h"
91 #include "components/signin/core/browser/signin_manager.h" 91 #include "components/signin/core/browser/signin_manager.h"
92 #include "components/signin/core/common/profile_management_switches.h" 92 #include "components/signin/core/common/profile_management_switches.h"
93 #include "content/public/browser/browser_thread.h" 93 #include "content/public/browser/browser_thread.h"
94 #include "content/public/browser/download_manager.h" 94 #include "content/public/browser/download_manager.h"
95 #include "content/public/browser/notification_service.h" 95 #include "content/public/browser/notification_service.h"
96 #include "content/public/browser/notification_types.h" 96 #include "content/public/browser/notification_types.h"
(...skipping 1586 matching lines...) Expand 10 before | Expand all | Expand 10 after
1683 1683
1684 //--------------------------------------------------------------------------- 1684 //---------------------------------------------------------------------------
1685 1685
1686 namespace app_controller_mac { 1686 namespace app_controller_mac {
1687 1687
1688 bool IsOpeningNewWindow() { 1688 bool IsOpeningNewWindow() {
1689 return g_is_opening_new_window; 1689 return g_is_opening_new_window;
1690 } 1690 }
1691 1691
1692 } // namespace app_controller_mac 1692 } // namespace app_controller_mac
OLDNEW
« no previous file with comments | « chrome/browser/android/preferences/pref_service_bridge.cc ('k') | chrome/browser/app_controller_mac_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698