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

Side by Side Diff: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm

Issue 8253002: Move PageTransition into content namespace. While I'm touching all these files, I've also updated... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/bookmarks/bookmark_bar_controller.h" 5 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h"
6 6
7 #include "base/mac/mac_util.h" 7 #include "base/mac/mac_util.h"
8 #include "base/metrics/histogram.h" 8 #include "base/metrics/histogram.h"
9 #include "base/sys_string_conversions.h" 9 #include "base/sys_string_conversions.h"
10 #include "chrome/browser/bookmarks/bookmark_editor.h" 10 #include "chrome/browser/bookmarks/bookmark_editor.h"
(...skipping 1093 matching lines...) Expand 10 before | Expand all | Expand 10 after
1104 } 1104 }
1105 } 1105 }
1106 1106
1107 // Enabled by default. 1107 // Enabled by default.
1108 return YES; 1108 return YES;
1109 } 1109 }
1110 1110
1111 // Actually open the URL. This is the last chance for a unit test to 1111 // Actually open the URL. This is the last chance for a unit test to
1112 // override. 1112 // override.
1113 - (void)openURL:(GURL)url disposition:(WindowOpenDisposition)disposition { 1113 - (void)openURL:(GURL)url disposition:(WindowOpenDisposition)disposition {
1114 browser_->OpenURL(url, GURL(), disposition, PageTransition::AUTO_BOOKMARK); 1114 browser_->OpenURL(
1115 url, GURL(), disposition, content::PAGE_TRANSITION_AUTO_BOOKMARK);
1115 } 1116 }
1116 1117
1117 - (void)clearMenuTagMap { 1118 - (void)clearMenuTagMap {
1118 seedId_ = 0; 1119 seedId_ = 0;
1119 menuTagMap_.clear(); 1120 menuTagMap_.clear();
1120 } 1121 }
1121 1122
1122 - (int)preferredHeight { 1123 - (int)preferredHeight {
1123 DCHECK(![self isAnimationRunning]); 1124 DCHECK(![self isAnimationRunning]);
1124 1125
(...skipping 1644 matching lines...) Expand 10 before | Expand all | Expand 10 after
2769 // to minimize touching the object passed in (likely a mock). 2770 // to minimize touching the object passed in (likely a mock).
2770 - (void)setButtonContextMenu:(id)menu { 2771 - (void)setButtonContextMenu:(id)menu {
2771 buttonContextMenu_ = menu; 2772 buttonContextMenu_ = menu;
2772 } 2773 }
2773 2774
2774 - (void)setIgnoreAnimations:(BOOL)ignore { 2775 - (void)setIgnoreAnimations:(BOOL)ignore {
2775 ignoreAnimations_ = ignore; 2776 ignoreAnimations_ = ignore;
2776 } 2777 }
2777 2778
2778 @end 2779 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698