Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(218)

Side by Side Diff: chrome/browser/ui/cocoa/intents/web_intent_inline_service_view_controller.mm

Issue 11230023: Web Intents Mac: Add view animation (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix test Created 8 years, 2 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
OLDNEW
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"
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 webFrame.origin.y = NSMaxY(separatorFrame) + 169 webFrame.origin.y = NSMaxY(separatorFrame) +
170 WebIntentPicker::kHeaderSeparatorPaddingBottom; 170 WebIntentPicker::kHeaderSeparatorPaddingBottom;
171 webFrame.origin.x = NSMinX(innerFrame); 171 webFrame.origin.x = NSMinX(innerFrame);
172 webFrame.size.width = NSWidth(innerFrame); 172 webFrame.size.width = NSWidth(innerFrame);
173 webFrame.size.height = NSMaxY(innerFrame) - NSMinY(webFrame); 173 webFrame.size.height = NSMaxY(innerFrame) - NSMinY(webFrame);
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 {
180 [self setServiceURL:GURL::EmptyGURL()];
181 }
182
179 @end 183 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698