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

Side by Side Diff: chrome/browser/ui/cocoa/profiles/profile_chooser_controller.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/ui/cocoa/profiles/profile_chooser_controller.h" 5 #import "chrome/browser/ui/cocoa/profiles/profile_chooser_controller.h"
6 6
7 #import <Carbon/Carbon.h> // kVK_Return. 7 #import <Carbon/Carbon.h> // kVK_Return.
8 #import <Cocoa/Cocoa.h> 8 #import <Cocoa/Cocoa.h>
9 #include <stddef.h> 9 #include <stddef.h>
10 10
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 #import "chrome/browser/ui/cocoa/profiles/user_manager_mac.h" 47 #import "chrome/browser/ui/cocoa/profiles/user_manager_mac.h"
48 #include "chrome/browser/ui/singleton_tabs.h" 48 #include "chrome/browser/ui/singleton_tabs.h"
49 #include "chrome/browser/ui/user_manager.h" 49 #include "chrome/browser/ui/user_manager.h"
50 #include "chrome/browser/ui/webui/signin/login_ui_service.h" 50 #include "chrome/browser/ui/webui/signin/login_ui_service.h"
51 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h" 51 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h"
52 #include "chrome/common/pref_names.h" 52 #include "chrome/common/pref_names.h"
53 #include "chrome/common/url_constants.h" 53 #include "chrome/common/url_constants.h"
54 #include "chrome/grit/chromium_strings.h" 54 #include "chrome/grit/chromium_strings.h"
55 #include "chrome/grit/generated_resources.h" 55 #include "chrome/grit/generated_resources.h"
56 #include "chrome/grit/theme_resources.h" 56 #include "chrome/grit/theme_resources.h"
57 #include "components/browser_sync/browser/profile_sync_service.h" 57 #include "components/browser_sync/profile_sync_service.h"
58 #include "components/prefs/pref_service.h" 58 #include "components/prefs/pref_service.h"
59 #include "components/signin/core/browser/profile_oauth2_token_service.h" 59 #include "components/signin/core/browser/profile_oauth2_token_service.h"
60 #include "components/signin/core/browser/signin_manager.h" 60 #include "components/signin/core/browser/signin_manager.h"
61 #include "components/signin/core/browser/signin_metrics.h" 61 #include "components/signin/core/browser/signin_metrics.h"
62 #include "components/signin/core/common/profile_management_switches.h" 62 #include "components/signin/core/common/profile_management_switches.h"
63 #include "content/public/browser/native_web_keyboard_event.h" 63 #include "content/public/browser/native_web_keyboard_event.h"
64 #include "content/public/browser/notification_service.h" 64 #include "content/public/browser/notification_service.h"
65 #include "content/public/browser/render_widget_host_view.h" 65 #include "content/public/browser/render_widget_host_view.h"
66 #include "content/public/browser/user_metrics.h" 66 #include "content/public/browser/user_metrics.h"
67 #include "content/public/browser/web_contents.h" 67 #include "content/public/browser/web_contents.h"
(...skipping 2867 matching lines...) Expand 10 before | Expand all | Expand 10 after
2935 } 2935 }
2936 2936
2937 - (bool)shouldShowGoIncognito { 2937 - (bool)shouldShowGoIncognito {
2938 bool incognitoAvailable = 2938 bool incognitoAvailable =
2939 IncognitoModePrefs::GetAvailability(browser_->profile()->GetPrefs()) != 2939 IncognitoModePrefs::GetAvailability(browser_->profile()->GetPrefs()) !=
2940 IncognitoModePrefs::DISABLED; 2940 IncognitoModePrefs::DISABLED;
2941 return incognitoAvailable && !browser_->profile()->IsGuestSession(); 2941 return incognitoAvailable && !browser_->profile()->IsGuestSession();
2942 } 2942 }
2943 2943
2944 @end 2944 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698