chrome/browser/ui/cocoa/profiles/avatar_button_controller.mm - Issue 498773003: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (part 2 …

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

Issue 498773003: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (part 2 … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: nit Created 6 years, 4 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 | Annotate | Revision Log

« chrome/browser/ui/android/content_settings/popup_blocked_infobar_delegate.cc ('K') | « chrome/browser/ui/cocoa/pdf_password_dialog.mm ('k') | chrome/browser/ui/cocoa/profiles/avatar_button_controller_unittest.mm » ('j') | chrome/browser/ui/views/extensions/extension_installed_bubble_view.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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_button_controller.h"	5 #import "chrome/browser/ui/cocoa/profiles/avatar_button_controller.h"

6	6

7 #include "base/mac/foundation_util.h"	7 #include "base/mac/foundation_util.h"

8 #include "base/strings/sys_string_conversions.h"	8 #include "base/strings/sys_string_conversions.h"

9 #include "chrome/browser/profiles/profiles_state.h"	9 #include "chrome/browser/profiles/profiles_state.h"

10 #include "chrome/browser/themes/theme_service.h"	10 #include "chrome/browser/themes/theme_service.h"

11 #include "chrome/browser/themes/theme_service_factory.h"	11 #include "chrome/browser/themes/theme_service_factory.h"

12 #include "chrome/browser/ui/browser.h"	12 #include "chrome/browser/ui/browser.h"

13 #include "chrome/browser/ui/browser_window.h"	13 #include "chrome/browser/ui/browser_window.h"

14 #import "chrome/browser/ui/cocoa/browser_window_controller.h"	14 #import "chrome/browser/ui/cocoa/browser_window_controller.h"

	15 #include "chrome/grit/generated_resources.h"

15 #include "components/signin/core/browser/signin_error_controller.h"	16 #include "components/signin/core/browser/signin_error_controller.h"

16 #include "grit/generated_resources.h"

17 #include "grit/theme_resources.h"	17 #include "grit/theme_resources.h"

18 #import "ui/base/cocoa/appkit_utils.h"	18 #import "ui/base/cocoa/appkit_utils.h"

19 #import "ui/base/cocoa/hover_image_button.h"	19 #import "ui/base/cocoa/hover_image_button.h"

20 #include "ui/base/l10n/l10n_util_mac.h"	20 #include "ui/base/l10n/l10n_util_mac.h"

21 #include "ui/base/nine_image_painter_factory.h"	21 #include "ui/base/nine_image_painter_factory.h"

22 #include "ui/base/resource/resource_bundle.h"	22 #include "ui/base/resource/resource_bundle.h"

23 #include "ui/gfx/image/image_skia_operations.h"	23 #include "ui/gfx/image/image_skia_operations.h"

24 #include "ui/gfx/image/image_skia_util_mac.h"	24 #include "ui/gfx/image/image_skia_util_mac.h"

25	25

26 namespace {	26 namespace {

(...skipping 242 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
269 layoutSubviews];	269 layoutSubviews];

270 }	270 }

271 }	271 }

272	272

273 - (void)updateErrorStatus:(BOOL)hasError {	273 - (void)updateErrorStatus:(BOOL)hasError {

274 [[button_ cell] setHasError:hasError withTitle:[button_ title]];	274 [[button_ cell] setHasError:hasError withTitle:[button_ title]];

275 [self updateAvatarButtonAndLayoutParent:YES];	275 [self updateAvatarButtonAndLayoutParent:YES];

276 }	276 }

277	277

278 @end	278 @end

OLD	NEW