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

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

Issue 6602010: Added "--login-user=" option for the Guest session. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/chrome/browser/chromeos/login
Patch Set: merge Created 9 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 | 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 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 namespace { 114 namespace {
115 115
116 // Overlap (in pixels) between the toolbar and the bookmark bar (when showing in 116 // Overlap (in pixels) between the toolbar and the bookmark bar (when showing in
117 // normal mode). 117 // normal mode).
118 const CGFloat kBookmarkBarOverlap = 3.0; 118 const CGFloat kBookmarkBarOverlap = 3.0;
119 119
120 // Duration of the bookmark bar animations. 120 // Duration of the bookmark bar animations.
121 const NSTimeInterval kBookmarkBarAnimationDuration = 0.12; 121 const NSTimeInterval kBookmarkBarAnimationDuration = 0.12;
122 122
123 void RecordAppLaunch(Profile* profile, GURL url) { 123 void RecordAppLaunch(Profile* profile, GURL url) {
124 // TODO: the ExtensionService should never be NULL, but in some cases it is, 124 DCHECK(profile->GetExtensionService());
125 // see bug 73768. After it is resolved, the explicit test can go away. 125 if (!profile->GetExtensionService()->IsInstalledApp(url))
126 ExtensionService* service = profile->GetExtensionService();
127 if (!service || !service->IsInstalledApp(url))
128 return; 126 return;
129 127
130 UMA_HISTOGRAM_ENUMERATION(extension_misc::kAppLaunchHistogram, 128 UMA_HISTOGRAM_ENUMERATION(extension_misc::kAppLaunchHistogram,
131 extension_misc::APP_LAUNCH_BOOKMARK_BAR, 129 extension_misc::APP_LAUNCH_BOOKMARK_BAR,
132 extension_misc::APP_LAUNCH_BUCKET_BOUNDARY); 130 extension_misc::APP_LAUNCH_BUCKET_BOUNDARY);
133 } 131 }
134 132
135 } // namespace 133 } // namespace
136 134
137 @interface BookmarkBarController(Private) 135 @interface BookmarkBarController(Private)
(...skipping 2382 matching lines...) Expand 10 before | Expand all | Expand 10 after
2520 // to minimize touching the object passed in (likely a mock). 2518 // to minimize touching the object passed in (likely a mock).
2521 - (void)setButtonContextMenu:(id)menu { 2519 - (void)setButtonContextMenu:(id)menu {
2522 buttonContextMenu_ = menu; 2520 buttonContextMenu_ = menu;
2523 } 2521 }
2524 2522
2525 - (void)setIgnoreAnimations:(BOOL)ignore { 2523 - (void)setIgnoreAnimations:(BOOL)ignore {
2526 ignoreAnimations_ = ignore; 2524 ignoreAnimations_ = ignore;
2527 } 2525 }
2528 2526
2529 @end 2527 @end
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser_navigator_browsertest_chromeos.cc ('k') | chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698