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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm

Issue 595283002: Move nsview_additions and hyperlink_text_view to ui/base/cocoa (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 years, 2 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
« chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller.mm ('K') | « chrome/browser/ui/cocoa/presentation_mode_controller.mm ('k') | chrome/browser/ui/cocoa/profiles/profile_signin_confirmation_view_controller.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <Cocoa/Cocoa.h> 5 #import <Cocoa/Cocoa.h>
6 6
7 #import "chrome/browser/ui/cocoa/profiles/profile_chooser_controller.h" 7 #import "chrome/browser/ui/cocoa/profiles/profile_chooser_controller.h"
8 8
9 #include "base/mac/bundle_locations.h" 9 #include "base/mac/bundle_locations.h"
10 #include "base/prefs/pref_service.h" 10 #include "base/prefs/pref_service.h"
(...skipping 16 matching lines...) Expand all
27 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" 27 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
28 #include "chrome/browser/signin/signin_header_helper.h" 28 #include "chrome/browser/signin/signin_header_helper.h"
29 #include "chrome/browser/signin/signin_manager_factory.h" 29 #include "chrome/browser/signin/signin_manager_factory.h"
30 #include "chrome/browser/signin/signin_promo.h" 30 #include "chrome/browser/signin/signin_promo.h"
31 #include "chrome/browser/signin/signin_ui_util.h" 31 #include "chrome/browser/signin/signin_ui_util.h"
32 #include "chrome/browser/ui/browser.h" 32 #include "chrome/browser/ui/browser.h"
33 #include "chrome/browser/ui/browser_commands.h" 33 #include "chrome/browser/ui/browser_commands.h"
34 #include "chrome/browser/ui/browser_window.h" 34 #include "chrome/browser/ui/browser_window.h"
35 #include "chrome/browser/ui/chrome_pages.h" 35 #include "chrome/browser/ui/chrome_pages.h"
36 #include "chrome/browser/ui/chrome_style.h" 36 #include "chrome/browser/ui/chrome_style.h"
37 #include "chrome/browser/ui/user_manager.h"
38 #import "chrome/browser/ui/cocoa/hyperlink_text_view.h"
39 #import "chrome/browser/ui/cocoa/info_bubble_view.h" 37 #import "chrome/browser/ui/cocoa/info_bubble_view.h"
40 #import "chrome/browser/ui/cocoa/info_bubble_window.h" 38 #import "chrome/browser/ui/cocoa/info_bubble_window.h"
41 #import "chrome/browser/ui/cocoa/profiles/user_manager_mac.h" 39 #import "chrome/browser/ui/cocoa/profiles/user_manager_mac.h"
42 #include "chrome/browser/ui/singleton_tabs.h" 40 #include "chrome/browser/ui/singleton_tabs.h"
41 #include "chrome/browser/ui/user_manager.h"
43 #include "chrome/browser/ui/webui/signin/login_ui_service.h" 42 #include "chrome/browser/ui/webui/signin/login_ui_service.h"
44 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h" 43 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h"
45 #include "chrome/common/pref_names.h" 44 #include "chrome/common/pref_names.h"
46 #include "chrome/common/url_constants.h" 45 #include "chrome/common/url_constants.h"
47 #include "chrome/grit/chromium_strings.h" 46 #include "chrome/grit/chromium_strings.h"
48 #include "chrome/grit/generated_resources.h" 47 #include "chrome/grit/generated_resources.h"
49 #include "components/signin/core/browser/mutable_profile_oauth2_token_service.h" 48 #include "components/signin/core/browser/mutable_profile_oauth2_token_service.h"
50 #include "components/signin/core/browser/profile_oauth2_token_service.h" 49 #include "components/signin/core/browser/profile_oauth2_token_service.h"
51 #include "components/signin/core/browser/signin_manager.h" 50 #include "components/signin/core/browser/signin_manager.h"
52 #include "components/signin/core/common/profile_management_switches.h" 51 #include "components/signin/core/common/profile_management_switches.h"
53 #include "content/public/browser/notification_service.h" 52 #include "content/public/browser/notification_service.h"
54 #include "content/public/browser/web_contents.h" 53 #include "content/public/browser/web_contents.h"
55 #include "google_apis/gaia/oauth2_token_service.h" 54 #include "google_apis/gaia/oauth2_token_service.h"
56 #include "grit/theme_resources.h" 55 #include "grit/theme_resources.h"
57 #include "skia/ext/skia_utils_mac.h" 56 #include "skia/ext/skia_utils_mac.h"
58 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTw eaker.h" 57 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTw eaker.h"
59 #import "ui/base/cocoa/cocoa_base_utils.h" 58 #import "ui/base/cocoa/cocoa_base_utils.h"
60 #import "ui/base/cocoa/controls/blue_label_button.h" 59 #import "ui/base/cocoa/controls/blue_label_button.h"
61 #import "ui/base/cocoa/controls/hyperlink_button_cell.h" 60 #import "ui/base/cocoa/controls/hyperlink_button_cell.h"
61 #import "ui/base/cocoa/controls/hyperlink_text_view.h"
62 #import "ui/base/cocoa/hover_image_button.h" 62 #import "ui/base/cocoa/hover_image_button.h"
63 #include "ui/base/cocoa/window_size_constants.h" 63 #include "ui/base/cocoa/window_size_constants.h"
64 #include "ui/base/l10n/l10n_util.h" 64 #include "ui/base/l10n/l10n_util.h"
65 #include "ui/base/l10n/l10n_util_mac.h" 65 #include "ui/base/l10n/l10n_util_mac.h"
66 #include "ui/base/resource/resource_bundle.h" 66 #include "ui/base/resource/resource_bundle.h"
67 #include "ui/gfx/image/image.h" 67 #include "ui/gfx/image/image.h"
68 #include "ui/gfx/text_elider.h" 68 #include "ui/gfx/text_elider.h"
69 #include "ui/native_theme/common_theme.h" 69 #include "ui/native_theme/common_theme.h"
70 #include "ui/native_theme/native_theme.h" 70 #include "ui/native_theme/native_theme.h"
71 71
(...skipping 2119 matching lines...) Expand 10 before | Expand all | Expand 10 after
2191 } 2191 }
2192 2192
2193 - (bool)shouldShowGoIncognito { 2193 - (bool)shouldShowGoIncognito {
2194 bool incognitoAvailable = 2194 bool incognitoAvailable =
2195 IncognitoModePrefs::GetAvailability(browser_->profile()->GetPrefs()) != 2195 IncognitoModePrefs::GetAvailability(browser_->profile()->GetPrefs()) !=
2196 IncognitoModePrefs::DISABLED; 2196 IncognitoModePrefs::DISABLED;
2197 return incognitoAvailable && !browser_->profile()->IsGuestSession(); 2197 return incognitoAvailable && !browser_->profile()->IsGuestSession();
2198 } 2198 }
2199 2199
2200 @end 2200 @end
OLDNEW
« chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller.mm ('K') | « chrome/browser/ui/cocoa/presentation_mode_controller.mm ('k') | chrome/browser/ui/cocoa/profiles/profile_signin_confirmation_view_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698