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/intents/web_intent_inline_service_view_controll
er.h" | 5 #import "chrome/browser/ui/cocoa/intents/web_intent_inline_service_view_controll
er.h" |
6 | 6 |
7 #include "chrome/browser/ui/browser_finder.h" | 7 #include "chrome/browser/ui/browser_finder.h" |
8 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_control_u
tils.h" | 8 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_control_u
tils.h" |
9 #import "chrome/browser/ui/cocoa/flipped_view.h" | 9 #import "chrome/browser/ui/cocoa/flipped_view.h" |
10 #import "chrome/browser/ui/cocoa/hyperlink_button_cell.h" | 10 #import "chrome/browser/ui/cocoa/hyperlink_button_cell.h" |
11 #import "chrome/browser/ui/cocoa/intents/web_intent_picker_cocoa2.h" | 11 #import "chrome/browser/ui/cocoa/intents/web_intent_picker_cocoa.h" |
12 #include "chrome/browser/ui/constrained_window.h" | 12 #include "chrome/browser/ui/constrained_window.h" |
13 #include "chrome/browser/ui/constrained_window_constants.h" | 13 #include "chrome/browser/ui/constrained_window_constants.h" |
14 #include "chrome/browser/ui/intents/web_intent_picker.h" | 14 #include "chrome/browser/ui/intents/web_intent_picker.h" |
15 #include "chrome/browser/ui/intents/web_intent_picker_delegate.h" | 15 #include "chrome/browser/ui/intents/web_intent_picker_delegate.h" |
16 #include "chrome/browser/ui/intents/web_intent_inline_disposition_delegate.h" | 16 #include "chrome/browser/ui/intents/web_intent_inline_disposition_delegate.h" |
17 #include "content/public/browser/web_contents.h" | 17 #include "content/public/browser/web_contents.h" |
18 #include "grit/generated_resources.h" | 18 #include "grit/generated_resources.h" |
19 #include "skia/ext/skia_utils_mac.h" | 19 #include "skia/ext/skia_utils_mac.h" |
20 #include "ui/base/l10n/l10n_util_mac.h" | 20 #include "ui/base/l10n/l10n_util_mac.h" |
21 | 21 |
22 @implementation WebIntentInlineServiceViewController | 22 @implementation WebIntentInlineServiceViewController |
23 | 23 |
24 - (id)initWithPicker:(WebIntentPickerCocoa2*)picker { | 24 - (id)initWithPicker:(WebIntentPickerCocoa*)picker { |
25 if ((self = [super init])) { | 25 if ((self = [super init])) { |
26 picker_ = picker; | 26 picker_ = picker; |
27 | 27 |
28 scoped_nsobject<NSView> view( | 28 scoped_nsobject<NSView> view( |
29 [[FlippedView alloc] initWithFrame:NSZeroRect]); | 29 [[FlippedView alloc] initWithFrame:NSZeroRect]); |
30 [self setView:view]; | 30 [self setView:view]; |
31 | 31 |
32 serviceIconImageView_.reset([[NSImageView alloc] initWithFrame:NSZeroRect]); | 32 serviceIconImageView_.reset([[NSImageView alloc] initWithFrame:NSZeroRect]); |
33 [serviceIconImageView_ setImageFrameStyle:NSImageFrameNone]; | 33 [serviceIconImageView_ setImageFrameStyle:NSImageFrameNone]; |
34 [[self view] addSubview:serviceIconImageView_]; | 34 [[self view] addSubview:serviceIconImageView_]; |
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
174 [webContentView_ setFrame:webFrame]; | 174 [webContentView_ setFrame:webFrame]; |
175 [webContents_->GetNativeView() setFrame:[webContentView_ bounds]]; | 175 [webContents_->GetNativeView() setFrame:[webContentView_ bounds]]; |
176 } | 176 } |
177 } | 177 } |
178 | 178 |
179 - (void)viewRemovedFromSuperview { | 179 - (void)viewRemovedFromSuperview { |
180 [self setServiceURL:GURL::EmptyGURL()]; | 180 [self setServiceURL:GURL::EmptyGURL()]; |
181 } | 181 } |
182 | 182 |
183 @end | 183 @end |
OLD | NEW |