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

Side by Side Diff: chrome/browser/ui/cocoa/toolbar/toolbar_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/toolbar/toolbar_controller.h" 5 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/mac/bundle_locations.h" 9 #include "base/mac/bundle_locations.h"
10 #include "base/mac/mac_util.h" 10 #include "base/mac/mac_util.h"
(...skipping 27 matching lines...) Expand all
38 #import "chrome/browser/ui/cocoa/toolbar/toolbar_button.h" 38 #import "chrome/browser/ui/cocoa/toolbar/toolbar_button.h"
39 #import "chrome/browser/ui/cocoa/toolbar/toolbar_view.h" 39 #import "chrome/browser/ui/cocoa/toolbar/toolbar_view.h"
40 #import "chrome/browser/ui/cocoa/toolbar/wrench_toolbar_button_cell.h" 40 #import "chrome/browser/ui/cocoa/toolbar/wrench_toolbar_button_cell.h"
41 #import "chrome/browser/ui/cocoa/view_id_util.h" 41 #import "chrome/browser/ui/cocoa/view_id_util.h"
42 #import "chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.h" 42 #import "chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.h"
43 #include "chrome/browser/ui/omnibox/omnibox_view.h" 43 #include "chrome/browser/ui/omnibox/omnibox_view.h"
44 #include "chrome/browser/ui/tabs/tab_strip_model.h" 44 #include "chrome/browser/ui/tabs/tab_strip_model.h"
45 #include "chrome/browser/ui/toolbar/wrench_menu_badge_controller.h" 45 #include "chrome/browser/ui/toolbar/wrench_menu_badge_controller.h"
46 #include "chrome/browser/ui/toolbar/wrench_menu_model.h" 46 #include "chrome/browser/ui/toolbar/wrench_menu_model.h"
47 #include "chrome/common/pref_names.h" 47 #include "chrome/common/pref_names.h"
48 #include "chrome/grit/chromium_strings.h"
49 #include "chrome/grit/generated_resources.h"
48 #include "components/metrics/proto/omnibox_event.pb.h" 50 #include "components/metrics/proto/omnibox_event.pb.h"
49 #include "components/omnibox/autocomplete_match.h" 51 #include "components/omnibox/autocomplete_match.h"
50 #include "components/search_engines/template_url_service.h" 52 #include "components/search_engines/template_url_service.h"
51 #include "components/url_fixer/url_fixer.h" 53 #include "components/url_fixer/url_fixer.h"
52 #include "content/public/browser/web_contents.h" 54 #include "content/public/browser/web_contents.h"
53 #include "grit/chromium_strings.h"
54 #include "grit/generated_resources.h"
55 #include "grit/theme_resources.h" 55 #include "grit/theme_resources.h"
56 #import "ui/base/cocoa/menu_controller.h" 56 #import "ui/base/cocoa/menu_controller.h"
57 #include "ui/base/l10n/l10n_util.h" 57 #include "ui/base/l10n/l10n_util.h"
58 #include "ui/base/l10n/l10n_util_mac.h" 58 #include "ui/base/l10n/l10n_util_mac.h"
59 #include "ui/gfx/image/image.h" 59 #include "ui/gfx/image/image.h"
60 #include "ui/gfx/rect.h" 60 #include "ui/gfx/rect.h"
61 61
62 using content::OpenURLParams; 62 using content::OpenURLParams;
63 using content::Referrer; 63 using content::Referrer;
64 using content::WebContents; 64 using content::WebContents;
(...skipping 770 matching lines...) Expand 10 before | Expand all | Expand 10 after
835 - (void)hideDropURLsIndicatorInView:(NSView*)view { 835 - (void)hideDropURLsIndicatorInView:(NSView*)view {
836 // Do nothing. 836 // Do nothing.
837 } 837 }
838 838
839 // (URLDropTargetController protocol) 839 // (URLDropTargetController protocol)
840 - (BOOL)isUnsupportedDropData:(id<NSDraggingInfo>)info { 840 - (BOOL)isUnsupportedDropData:(id<NSDraggingInfo>)info {
841 return drag_util::IsUnsupportedDropData(profile_, info); 841 return drag_util::IsUnsupportedDropData(profile_, info);
842 } 842 }
843 843
844 @end 844 @end
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/toolbar/reload_button.mm ('k') | chrome/browser/ui/cocoa/translate/translate_bubble_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698