| OLD | NEW |
| 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/avatar_base_controller.h" | 5 #import "chrome/browser/ui/cocoa/profiles/avatar_base_controller.h" |
| 6 | 6 |
| 7 #include "base/mac/foundation_util.h" | 7 #include "base/mac/foundation_util.h" |
| 8 #include "chrome/app/chrome_command_ids.h" | 8 #include "chrome/app/chrome_command_ids.h" |
| 9 #include "chrome/browser/browser_process.h" | 9 #include "chrome/browser/browser_process.h" |
| 10 #include "chrome/browser/profiles/profile_avatar_icon_util.h" |
| 10 #include "chrome/browser/profiles/profile_info_cache_observer.h" | 11 #include "chrome/browser/profiles/profile_info_cache_observer.h" |
| 11 #include "chrome/browser/profiles/profile_avatar_icon_util.h" | |
| 12 #include "chrome/browser/profiles/profile_manager.h" | 12 #include "chrome/browser/profiles/profile_manager.h" |
| 13 #include "chrome/browser/profiles/profile_metrics.h" | 13 #include "chrome/browser/profiles/profile_metrics.h" |
| 14 #include "chrome/browser/profiles/profile_window.h" |
| 15 #include "chrome/browser/profiles/profiles_state.h" |
| 14 #include "chrome/browser/signin/signin_header_helper.h" | 16 #include "chrome/browser/signin/signin_header_helper.h" |
| 15 #include "chrome/browser/profiles/profiles_state.h" | |
| 16 #include "chrome/browser/profiles/profile_window.h" | |
| 17 #include "chrome/browser/ui/browser.h" | 17 #include "chrome/browser/ui/browser.h" |
| 18 #include "chrome/browser/ui/browser_commands.h" | 18 #include "chrome/browser/ui/browser_commands.h" |
| 19 #include "chrome/browser/ui/browser_window.h" | 19 #include "chrome/browser/ui/browser_window.h" |
| 20 #import "chrome/browser/ui/cocoa/base_bubble_controller.h" | 20 #import "chrome/browser/ui/cocoa/base_bubble_controller.h" |
| 21 #import "chrome/browser/ui/cocoa/browser_window_controller.h" | 21 #import "chrome/browser/ui/cocoa/browser_window_controller.h" |
| 22 #import "chrome/browser/ui/cocoa/profiles/avatar_menu_bubble_controller.h" | 22 #import "chrome/browser/ui/cocoa/profiles/avatar_menu_bubble_controller.h" |
| 23 #import "chrome/browser/ui/cocoa/profiles/profile_chooser_controller.h" | 23 #import "chrome/browser/ui/cocoa/profiles/profile_chooser_controller.h" |
| 24 #include "components/signin/core/browser/signin_error_controller.h" | 24 #include "components/signin/core/browser/signin_error_controller.h" |
| 25 #include "components/signin/core/common/profile_management_switches.h" | 25 #include "components/signin/core/common/profile_management_switches.h" |
| 26 | 26 |
| (...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 251 } | 251 } |
| 252 | 252 |
| 253 - (void)updateErrorStatus:(BOOL)hasError { | 253 - (void)updateErrorStatus:(BOOL)hasError { |
| 254 } | 254 } |
| 255 | 255 |
| 256 - (BaseBubbleController*)menuController { | 256 - (BaseBubbleController*)menuController { |
| 257 return menuController_; | 257 return menuController_; |
| 258 } | 258 } |
| 259 | 259 |
| 260 @end | 260 @end |
| OLD | NEW |