| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/tabs/tab_strip_controller.h" | 5 #import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h" |
| 6 | 6 |
| 7 #import <QuartzCore/QuartzCore.h> | 7 #import <QuartzCore/QuartzCore.h> |
| 8 | 8 |
| 9 #include <limits> | 9 #include <limits> |
| 10 #include <string> | 10 #include <string> |
| 11 | 11 |
| 12 #include "base/command_line.h" | 12 #include "base/command_line.h" |
| 13 #include "base/mac/mac_util.h" | 13 #include "base/mac/mac_util.h" |
| 14 #include "base/sys_string_conversions.h" | 14 #include "base/sys_string_conversions.h" |
| 15 #include "chrome/app/chrome_command_ids.h" | 15 #include "chrome/app/chrome_command_ids.h" |
| 16 #include "chrome/browser/autocomplete/autocomplete.h" | 16 #include "chrome/browser/autocomplete/autocomplete.h" |
| 17 #include "chrome/browser/autocomplete/autocomplete_classifier.h" | 17 #include "chrome/browser/autocomplete/autocomplete_classifier.h" |
| 18 #include "chrome/browser/autocomplete/autocomplete_match.h" | 18 #include "chrome/browser/autocomplete/autocomplete_match.h" |
| 19 #include "chrome/browser/debugger/devtools_window.h" | |
| 20 #include "chrome/browser/extensions/extension_tab_helper.h" | 19 #include "chrome/browser/extensions/extension_tab_helper.h" |
| 21 #include "chrome/browser/favicon/favicon_tab_helper.h" | 20 #include "chrome/browser/favicon/favicon_tab_helper.h" |
| 22 #include "chrome/browser/net/url_fixer_upper.h" | 21 #include "chrome/browser/net/url_fixer_upper.h" |
| 23 #include "chrome/browser/prefs/pref_service.h" | 22 #include "chrome/browser/prefs/pref_service.h" |
| 24 #include "chrome/browser/profiles/profile.h" | 23 #include "chrome/browser/profiles/profile.h" |
| 25 #include "chrome/browser/profiles/profile_manager.h" | 24 #include "chrome/browser/profiles/profile_manager.h" |
| 26 #include "chrome/browser/sidebar/sidebar_container.h" | 25 #include "chrome/browser/sidebar/sidebar_container.h" |
| 27 #include "chrome/browser/sidebar/sidebar_manager.h" | 26 #include "chrome/browser/sidebar/sidebar_manager.h" |
| 28 #include "chrome/browser/tabs/tab_strip_model.h" | 27 #include "chrome/browser/tabs/tab_strip_model.h" |
| 29 #include "chrome/browser/tabs/tab_strip_selection_model.h" | 28 #include "chrome/browser/tabs/tab_strip_selection_model.h" |
| (...skipping 12 matching lines...) Expand all Loading... |
| 42 #import "chrome/browser/ui/cocoa/tabs/tab_view.h" | 41 #import "chrome/browser/ui/cocoa/tabs/tab_view.h" |
| 43 #import "chrome/browser/ui/cocoa/tabs/throbber_view.h" | 42 #import "chrome/browser/ui/cocoa/tabs/throbber_view.h" |
| 44 #import "chrome/browser/ui/cocoa/tracking_area.h" | 43 #import "chrome/browser/ui/cocoa/tracking_area.h" |
| 45 #include "chrome/browser/ui/find_bar/find_bar.h" | 44 #include "chrome/browser/ui/find_bar/find_bar.h" |
| 46 #include "chrome/browser/ui/find_bar/find_bar_controller.h" | 45 #include "chrome/browser/ui/find_bar/find_bar_controller.h" |
| 47 #include "chrome/browser/ui/find_bar/find_tab_helper.h" | 46 #include "chrome/browser/ui/find_bar/find_tab_helper.h" |
| 48 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" | 47 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" |
| 49 #include "chrome/browser/ui/tabs/tab_menu_model.h" | 48 #include "chrome/browser/ui/tabs/tab_menu_model.h" |
| 50 #include "chrome/common/chrome_switches.h" | 49 #include "chrome/common/chrome_switches.h" |
| 51 #include "chrome/common/pref_names.h" | 50 #include "chrome/common/pref_names.h" |
| 51 #include "content/browser/debugger/devtools_window.h" |
| 52 #include "content/browser/tab_contents/navigation_controller.h" | 52 #include "content/browser/tab_contents/navigation_controller.h" |
| 53 #include "content/browser/tab_contents/navigation_entry.h" | 53 #include "content/browser/tab_contents/navigation_entry.h" |
| 54 #include "content/browser/tab_contents/tab_contents.h" | 54 #include "content/browser/tab_contents/tab_contents.h" |
| 55 #include "content/browser/tab_contents/tab_contents_view.h" | 55 #include "content/browser/tab_contents/tab_contents_view.h" |
| 56 #include "content/browser/user_metrics.h" | 56 #include "content/browser/user_metrics.h" |
| 57 #include "content/common/notification_service.h" | 57 #include "content/common/notification_service.h" |
| 58 #include "grit/app_resources.h" | 58 #include "grit/app_resources.h" |
| 59 #include "grit/generated_resources.h" | 59 #include "grit/generated_resources.h" |
| 60 #include "grit/theme_resources.h" | 60 #include "grit/theme_resources.h" |
| 61 #include "grit/theme_resources_standard.h" | 61 #include "grit/theme_resources_standard.h" |
| (...skipping 2074 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2136 } | 2136 } |
| 2137 | 2137 |
| 2138 std::string profileName = browser_->profile()->GetPrefs()->GetString( | 2138 std::string profileName = browser_->profile()->GetPrefs()->GetString( |
| 2139 prefs::kGoogleServicesUsername); | 2139 prefs::kGoogleServicesUsername); |
| 2140 [profileMenuButton_ setProfileDisplayName: | 2140 [profileMenuButton_ setProfileDisplayName: |
| 2141 [NSString stringWithUTF8String:profileName.c_str()]]; | 2141 [NSString stringWithUTF8String:profileName.c_str()]]; |
| 2142 [profileMenuButton_ setHidden:NO]; | 2142 [profileMenuButton_ setHidden:NO]; |
| 2143 } | 2143 } |
| 2144 | 2144 |
| 2145 @end | 2145 @end |
| OLD | NEW |