chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.mm - Issue 284893003: Move bookmarks/core/... to bookmarks/...

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

Issue 284893003: Move bookmarks/core/... to bookmarks/... (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixing errors reported by presubmit Created 6 years, 7 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

OLD	NEW
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/bookmarks/bookmark_bubble_controller.h"	5 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.h"

6	6

7 #include "base/mac/bundle_locations.h"	7 #include "base/mac/bundle_locations.h"

8 #include "base/mac/mac_util.h"	8 #include "base/mac/mac_util.h"

9 #include "base/strings/sys_string_conversions.h"	9 #include "base/strings/sys_string_conversions.h"

10 #include "chrome/browser/ui/browser.h"	10 #include "chrome/browser/ui/browser.h"

11 #include "chrome/browser/ui/browser_finder.h"	11 #include "chrome/browser/ui/browser_finder.h"

12 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button.h"	12 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button.h"

13 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_sync_promo_controller.h"	13 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_sync_promo_controller.h"

14 #import "chrome/browser/ui/cocoa/browser_window_controller.h"	14 #import "chrome/browser/ui/cocoa/browser_window_controller.h"

15 #import "chrome/browser/ui/cocoa/info_bubble_view.h"	15 #import "chrome/browser/ui/cocoa/info_bubble_view.h"

16 #include "chrome/browser/ui/sync/sync_promo_ui.h"	16 #include "chrome/browser/ui/sync/sync_promo_ui.h"

17 #include "components/bookmarks/core/browser/bookmark_model.h"	17 #include "components/bookmarks/browser/bookmark_model.h"

18 #include "components/bookmarks/core/browser/bookmark_utils.h"	18 #include "components/bookmarks/browser/bookmark_utils.h"

19 #include "content/public/browser/notification_observer.h"	19 #include "content/public/browser/notification_observer.h"

20 #include "content/public/browser/notification_registrar.h"	20 #include "content/public/browser/notification_registrar.h"

21 #include "content/public/browser/notification_service.h"	21 #include "content/public/browser/notification_service.h"

22 #include "content/public/browser/user_metrics.h"	22 #include "content/public/browser/user_metrics.h"

23 #include "grit/generated_resources.h"	23 #include "grit/generated_resources.h"

24 #include "ui/base/l10n/l10n_util_mac.h"	24 #include "ui/base/l10n/l10n_util_mac.h"

25	25

26 using base::UserMetricsAction;	26 using base::UserMetricsAction;

27	27

28 // An object to represent the ChooseAnotherFolder item in the pop up.	28 // An object to represent the ChooseAnotherFolder item in the pop up.

(...skipping 365 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
394 NSInteger idx = [menu indexOfItemWithRepresentedObject:parentValue];	394 NSInteger idx = [menu indexOfItemWithRepresentedObject:parentValue];

395 DCHECK(idx != -1);	395 DCHECK(idx != -1);

396 [folderPopUpButton_ selectItemAtIndex:idx];	396 [folderPopUpButton_ selectItemAtIndex:idx];

397 }	397 }

398	398

399 - (NSPopUpButton*)folderPopUpButton {	399 - (NSPopUpButton*)folderPopUpButton {

400 return folderPopUpButton_;	400 return folderPopUpButton_;

401 }	401 }

402	402

403 @end // implementation BookmarkBubbleController(ExposedForUnitTesting)	403 @end // implementation BookmarkBubbleController(ExposedForUnitTesting)

OLD	NEW