chrome/browser/ui/cocoa/extensions/extension_install_view_controller.mm - Issue 11633052: Rename platform-independent ConstrainedWindow types to WebContentsModalDialog types (part 2)

Side by Side Diff: chrome/browser/ui/cocoa/extensions/extension_install_view_controller.mm

Issue 11633052: Rename platform-independent ConstrainedWindow types to WebContentsModalDialog types (part 2) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: use gtk_widget_get_toplevel for GetNativeWindow Created 7 years, 11 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/content_settings/collected_cookies_mac_browsertest.mm ('k') | chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa_browsertest.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 #import "chrome/browser/ui/cocoa/extensions/extension_install_view_controller.h"	5 #import "chrome/browser/ui/cocoa/extensions/extension_install_view_controller.h"

6	6

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

8 #include "base/i18n/rtl.h"	8 #include "base/i18n/rtl.h"

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

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

11 #include "base/string_util.h"	11 #include "base/string_util.h"

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

13 #include "base/utf_string_conversions.h"	13 #include "base/utf_string_conversions.h"

14 #include "chrome/browser/extensions/bundle_installer.h"	14 #include "chrome/browser/extensions/bundle_installer.h"

15 #import "chrome/browser/ui/chrome_style.h"	15 #import "chrome/browser/ui/chrome_style.h"

16 #import "chrome/browser/ui/cocoa/hyperlink_button_cell.h"	16 #import "chrome/browser/ui/cocoa/hyperlink_button_cell.h"

17 #include "chrome/browser/ui/constrained_window.h"	17 #include "chrome/browser/ui/web_contents_modal_dialog.h"

18 #include "chrome/common/extensions/extension.h"	18 #include "chrome/common/extensions/extension.h"

19 #include "content/public/browser/page_navigator.h"	19 #include "content/public/browser/page_navigator.h"

20 #include "grit/generated_resources.h"	20 #include "grit/generated_resources.h"

21 #include "skia/ext/skia_utils_mac.h"	21 #include "skia/ext/skia_utils_mac.h"

22 #import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h"	22 #import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h"

23 #include "ui/base/l10n/l10n_util.h"	23 #include "ui/base/l10n/l10n_util.h"

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

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

26	26

27 using content::OpenURLParams;	27 using content::OpenURLParams;

(...skipping 469 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
497 return warnings;	497 return warnings;

498 }	498 }

499	499

500 - (void)updateViewFrame:(NSRect)frame {	500 - (void)updateViewFrame:(NSRect)frame {

501 NSWindow* window = [[self view] window];	501 NSWindow* window = [[self view] window];

502 [window setFrame:[window frameRectForContentRect:frame] display:YES];	502 [window setFrame:[window frameRectForContentRect:frame] display:YES];

503 [[self view] setFrame:frame];	503 [[self view] setFrame:frame];

504 }	504 }

505	505

506 @end	506 @end

OLD	NEW