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

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

Issue 498773003: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (part 2 … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 3 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) 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/bookmarks/chrome_bookmark_client.h" 10 #include "chrome/browser/bookmarks/chrome_bookmark_client.h"
11 #include "chrome/browser/ui/browser.h" 11 #include "chrome/browser/ui/browser.h"
12 #include "chrome/browser/ui/browser_finder.h" 12 #include "chrome/browser/ui/browser_finder.h"
13 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button.h" 13 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button.h"
14 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_sync_promo_controller.h" 14 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_sync_promo_controller.h"
15 #import "chrome/browser/ui/cocoa/browser_window_controller.h" 15 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
16 #import "chrome/browser/ui/cocoa/info_bubble_view.h" 16 #import "chrome/browser/ui/cocoa/info_bubble_view.h"
17 #include "chrome/browser/ui/sync/sync_promo_ui.h" 17 #include "chrome/browser/ui/sync/sync_promo_ui.h"
18 #include "chrome/grit/generated_resources.h"
18 #include "components/bookmarks/browser/bookmark_model.h" 19 #include "components/bookmarks/browser/bookmark_model.h"
19 #include "components/bookmarks/browser/bookmark_utils.h" 20 #include "components/bookmarks/browser/bookmark_utils.h"
20 #include "content/public/browser/notification_observer.h" 21 #include "content/public/browser/notification_observer.h"
21 #include "content/public/browser/notification_registrar.h" 22 #include "content/public/browser/notification_registrar.h"
22 #include "content/public/browser/notification_service.h" 23 #include "content/public/browser/notification_service.h"
23 #include "content/public/browser/user_metrics.h" 24 #include "content/public/browser/user_metrics.h"
24 #include "grit/generated_resources.h"
25 #include "ui/base/l10n/l10n_util_mac.h" 25 #include "ui/base/l10n/l10n_util_mac.h"
26 26
27 using base::UserMetricsAction; 27 using base::UserMetricsAction;
28 28
29 // An object to represent the ChooseAnotherFolder item in the pop up. 29 // An object to represent the ChooseAnotherFolder item in the pop up.
30 @interface ChooseAnotherFolder : NSObject 30 @interface ChooseAnotherFolder : NSObject
31 @end 31 @end
32 32
33 @implementation ChooseAnotherFolder 33 @implementation ChooseAnotherFolder
34 @end 34 @end
(...skipping 365 matching lines...) Expand 10 before | Expand all | Expand 10 after
400 NSInteger idx = [menu indexOfItemWithRepresentedObject:parentValue]; 400 NSInteger idx = [menu indexOfItemWithRepresentedObject:parentValue];
401 DCHECK(idx != -1); 401 DCHECK(idx != -1);
402 [folderPopUpButton_ selectItemAtIndex:idx]; 402 [folderPopUpButton_ selectItemAtIndex:idx];
403 } 403 }
404 404
405 - (NSPopUpButton*)folderPopUpButton { 405 - (NSPopUpButton*)folderPopUpButton {
406 return folderPopUpButton_; 406 return folderPopUpButton_;
407 } 407 }
408 408
409 @end // implementation BookmarkBubbleController(ExposedForUnitTesting) 409 @end // implementation BookmarkBubbleController(ExposedForUnitTesting)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698