| OLD | NEW |
| 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 #include "chrome/browser/ui/views/bookmark_bar_view.h" | 5 #include "chrome/browser/ui/views/bookmark_bar_view.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <limits> | 8 #include <limits> |
| 9 #include <set> | 9 #include <set> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 225 return views::MenuButton::OnMousePressed(e); | 225 return views::MenuButton::OnMousePressed(e); |
| 226 } | 226 } |
| 227 | 227 |
| 228 private: | 228 private: |
| 229 BookmarkBarView* owner_; | 229 BookmarkBarView* owner_; |
| 230 | 230 |
| 231 DISALLOW_COPY_AND_ASSIGN(OverFlowButton); | 231 DISALLOW_COPY_AND_ASSIGN(OverFlowButton); |
| 232 }; | 232 }; |
| 233 | 233 |
| 234 void RecordAppLaunch(Profile* profile, GURL url) { | 234 void RecordAppLaunch(Profile* profile, GURL url) { |
| 235 // TODO: the ExtensionService should never be NULL, but in some cases it is, | 235 DCHECK(profile->GetExtensionService()); |
| 236 // see bug 73768. After it is resolved, the explicit test can go away. | 236 if (!profile->GetExtensionService()->IsInstalledApp(url)) |
| 237 ExtensionService* service = profile->GetExtensionService(); | |
| 238 if (!service || !service->IsInstalledApp(url)) | |
| 239 return; | 237 return; |
| 240 | 238 |
| 241 UMA_HISTOGRAM_ENUMERATION(extension_misc::kAppLaunchHistogram, | 239 UMA_HISTOGRAM_ENUMERATION(extension_misc::kAppLaunchHistogram, |
| 242 extension_misc::APP_LAUNCH_BOOKMARK_BAR, | 240 extension_misc::APP_LAUNCH_BOOKMARK_BAR, |
| 243 extension_misc::APP_LAUNCH_BUCKET_BOUNDARY); | 241 extension_misc::APP_LAUNCH_BUCKET_BOUNDARY); |
| 244 } | 242 } |
| 245 | 243 |
| 246 } // namespace | 244 } // namespace |
| 247 | 245 |
| 248 // DropInfo ------------------------------------------------------------------- | 246 // DropInfo ------------------------------------------------------------------- |
| (...skipping 1513 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1762 // The tooltip is the only way we have to display text explaining the error | 1760 // The tooltip is the only way we have to display text explaining the error |
| 1763 // to the user. | 1761 // to the user. |
| 1764 sync_error_button->SetTooltipText( | 1762 sync_error_button->SetTooltipText( |
| 1765 UTF16ToWide(l10n_util::GetStringUTF16(IDS_SYNC_BOOKMARK_BAR_ERROR_DESC))); | 1763 UTF16ToWide(l10n_util::GetStringUTF16(IDS_SYNC_BOOKMARK_BAR_ERROR_DESC))); |
| 1766 sync_error_button->SetAccessibleName( | 1764 sync_error_button->SetAccessibleName( |
| 1767 l10n_util::GetStringUTF16(IDS_ACCNAME_SYNC_ERROR_BUTTON)); | 1765 l10n_util::GetStringUTF16(IDS_ACCNAME_SYNC_ERROR_BUTTON)); |
| 1768 sync_error_button->SetIcon( | 1766 sync_error_button->SetIcon( |
| 1769 *ResourceBundle::GetSharedInstance().GetBitmapNamed(IDR_WARNING)); | 1767 *ResourceBundle::GetSharedInstance().GetBitmapNamed(IDR_WARNING)); |
| 1770 return sync_error_button; | 1768 return sync_error_button; |
| 1771 } | 1769 } |
| OLD | NEW |