chrome/browser/ui/panels/panel_window_controller_cocoa.mm - Issue 10765021: Make the id used in IconMsg_DownloadFavicon unique

Side by Side Diff: chrome/browser/ui/panels/panel_window_controller_cocoa.mm

Issue 10765021: Make the id used in IconMsg_DownloadFavicon unique (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 5 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

« no previous file with comments | « chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm ('k') | chrome/browser/ui/views/ash/balloon_view_ash.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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 #include "chrome/browser/ui/panels/panel_window_controller_cocoa.h"	5 #include "chrome/browser/ui/panels/panel_window_controller_cocoa.h"

6	6

7 #import <Cocoa/Cocoa.h>	7 #import <Cocoa/Cocoa.h>

8	8

9 #include "base/auto_reset.h"	9 #include "base/auto_reset.h"

10 #include "base/logging.h"	10 #include "base/logging.h"

11 #include "base/mac/bundle_locations.h"	11 #include "base/mac/bundle_locations.h"

12 #include "base/mac/mac_util.h"	12 #include "base/mac/mac_util.h"

13 #include "base/mac/scoped_nsautorelease_pool.h"	13 #include "base/mac/scoped_nsautorelease_pool.h"

14 #include "base/sys_string_conversions.h"	14 #include "base/sys_string_conversions.h"

15 #include "chrome/app/chrome_command_ids.h" // IDC_*	15 #include "chrome/app/chrome_command_ids.h" // IDC_*

16 #include "chrome/browser/chrome_browser_application_mac.h"	16 #include "chrome/browser/chrome_browser_application_mac.h"

17 #include "chrome/browser/profiles/profile.h"	17 #include "chrome/browser/profiles/profile.h"

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

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

20 #import "chrome/browser/ui/cocoa/browser_window_utils.h"	20 #import "chrome/browser/ui/cocoa/browser_window_utils.h"

21 #import "chrome/browser/ui/cocoa/event_utils.h"	21 #import "chrome/browser/ui/cocoa/event_utils.h"

22 #import "chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h"	22 #import "chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h"

23 #import "chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.h"	23 #import "chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.h"

24 #import "chrome/browser/ui/cocoa/menu_controller.h"	24 #import "chrome/browser/ui/cocoa/menu_controller.h"

25 #import "chrome/browser/ui/cocoa/tab_contents/favicon_util.h"	25 #import "chrome/browser/ui/cocoa/tab_contents/favicon_util_mac.h"

26 #import "chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.h"	26 #import "chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.h"

27 #import "chrome/browser/ui/cocoa/tabs/throbber_view.h"	27 #import "chrome/browser/ui/cocoa/tabs/throbber_view.h"

28 #include "chrome/browser/ui/panels/native_panel_cocoa.h"	28 #include "chrome/browser/ui/panels/native_panel_cocoa.h"

29 #include "chrome/browser/ui/panels/panel_bounds_animation.h"	29 #include "chrome/browser/ui/panels/panel_bounds_animation.h"

30 #include "chrome/browser/ui/panels/panel_constants.h"	30 #include "chrome/browser/ui/panels/panel_constants.h"

31 #include "chrome/browser/ui/panels/panel_manager.h"	31 #include "chrome/browser/ui/panels/panel_manager.h"

32 #include "chrome/browser/ui/panels/panel_strip.h"	32 #include "chrome/browser/ui/panels/panel_strip.h"

33 #import "chrome/browser/ui/panels/panel_titlebar_view_cocoa.h"	33 #import "chrome/browser/ui/panels/panel_titlebar_view_cocoa.h"

34 #import "chrome/browser/ui/panels/panel_utils_cocoa.h"	34 #import "chrome/browser/ui/panels/panel_utils_cocoa.h"

35 #include "chrome/browser/ui/tabs/tab_strip_model.h"	35 #include "chrome/browser/ui/tabs/tab_strip_model.h"

(...skipping 1009 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1045 - (NSRect)contentRectForFrameRect:(NSRect)frameRect {	1045 - (NSRect)contentRectForFrameRect:(NSRect)frameRect {

1046 NSRect contentRect = [[[self window] contentView] convertRect:frameRect	1046 NSRect contentRect = [[[self window] contentView] convertRect:frameRect

1047 fromView:nil];	1047 fromView:nil];

1048 contentRect.size.height -= panel::kTitlebarHeight;	1048 contentRect.size.height -= panel::kTitlebarHeight;

1049 if (contentRect.size.height < 0)	1049 if (contentRect.size.height < 0)

1050 contentRect.size.height = 0;	1050 contentRect.size.height = 0;

1051 return contentRect;	1051 return contentRect;

1052 }	1052 }

1053	1053

1054 @end	1054 @end

OLD	NEW