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

Side by Side Diff: chrome/browser/ui/cocoa/tab_contents/instant_overlay_controller_mac.mm

Issue 12520005: Move desktop-specific Instant bits to c/b/ui/search. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 7 years, 9 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
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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/cocoa/tab_contents/instant_overlay_controller_mac.h"
6 #include "chrome/browser/instant/instant_overlay_model.h"
7 #include "chrome/browser/ui/browser.h" 5 #include "chrome/browser/ui/browser.h"
8 #import "chrome/browser/ui/cocoa/browser_window_controller.h" 6 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
7 #include "chrome/browser/ui/cocoa/tab_contents/instant_overlay_controller_mac.h"
9 #import "chrome/browser/ui/cocoa/tab_contents/overlayable_contents_controller.h" 8 #import "chrome/browser/ui/cocoa/tab_contents/overlayable_contents_controller.h"
9 #include "chrome/browser/ui/search/instant_overlay_model.h"
10 10
11 InstantOverlayControllerMac::InstantOverlayControllerMac( 11 InstantOverlayControllerMac::InstantOverlayControllerMac(
12 Browser* browser, 12 Browser* browser,
13 BrowserWindowController* window, 13 BrowserWindowController* window,
14 OverlayableContentsController* overlay) 14 OverlayableContentsController* overlay)
15 : InstantOverlayController(browser), 15 : InstantOverlayController(browser),
16 window_(window), 16 window_(window),
17 overlay_(overlay) { 17 overlay_(overlay) {
18 } 18 }
19 19
(...skipping 14 matching lines...) Expand all
34 drawDropShadow:drawDropShadow]; 34 drawDropShadow:drawDropShadow];
35 } else { 35 } else {
36 [overlay_ setOverlay:NULL 36 [overlay_ setOverlay:NULL
37 height:0 37 height:0
38 heightUnits:INSTANT_SIZE_PIXELS 38 heightUnits:INSTANT_SIZE_PIXELS
39 drawDropShadow:NO]; 39 drawDropShadow:NO];
40 } 40 }
41 browser_->MaybeUpdateBookmarkBarStateForInstantOverlay(model.mode()); 41 browser_->MaybeUpdateBookmarkBarStateForInstantOverlay(model.mode());
42 [window_ updateBookmarkBarStateForInstantOverlay]; 42 [window_ updateBookmarkBarStateForInstantOverlay];
43 } 43 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698