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

Side by Side Diff: chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm

Issue 12578008: Move CrxFile, FileReader, ExtensionResource to src/extensions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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/location_bar/location_bar_view_mac.h" 5 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/message_loop.h" 9 #include "base/message_loop.h"
10 #include "base/prefs/pref_service.h" 10 #include "base/prefs/pref_service.h"
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h" 49 #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h"
50 #include "chrome/browser/ui/content_settings/content_setting_image_model.h" 50 #include "chrome/browser/ui/content_settings/content_setting_image_model.h"
51 #include "chrome/browser/ui/omnibox/alternate_nav_url_fetcher.h" 51 #include "chrome/browser/ui/omnibox/alternate_nav_url_fetcher.h"
52 #include "chrome/browser/ui/omnibox/location_bar_util.h" 52 #include "chrome/browser/ui/omnibox/location_bar_util.h"
53 #import "chrome/browser/ui/omnibox/omnibox_popup_model.h" 53 #import "chrome/browser/ui/omnibox/omnibox_popup_model.h"
54 #include "chrome/browser/ui/tabs/tab_strip_model.h" 54 #include "chrome/browser/ui/tabs/tab_strip_model.h"
55 #include "chrome/browser/ui/zoom/zoom_controller.h" 55 #include "chrome/browser/ui/zoom/zoom_controller.h"
56 #include "chrome/common/chrome_notification_types.h" 56 #include "chrome/common/chrome_notification_types.h"
57 #include "chrome/common/chrome_switches.h" 57 #include "chrome/common/chrome_switches.h"
58 #include "chrome/common/extensions/extension.h" 58 #include "chrome/common/extensions/extension.h"
59 #include "chrome/common/extensions/extension_resource.h"
60 #include "chrome/common/extensions/feature_switch.h" 59 #include "chrome/common/extensions/feature_switch.h"
61 #include "chrome/common/pref_names.h" 60 #include "chrome/common/pref_names.h"
62 #include "content/public/browser/notification_service.h" 61 #include "content/public/browser/notification_service.h"
63 #include "content/public/browser/web_contents.h" 62 #include "content/public/browser/web_contents.h"
64 #include "grit/generated_resources.h" 63 #include "grit/generated_resources.h"
65 #include "grit/theme_resources.h" 64 #include "grit/theme_resources.h"
66 #include "net/base/net_util.h" 65 #include "net/base/net_util.h"
67 #include "skia/ext/skia_utils_mac.h" 66 #include "skia/ext/skia_utils_mac.h"
68 #include "ui/base/l10n/l10n_util_mac.h" 67 #include "ui/base/l10n/l10n_util_mac.h"
69 #include "ui/base/resource/resource_bundle.h" 68 #include "ui/base/resource/resource_bundle.h"
(...skipping 720 matching lines...) Expand 10 before | Expand all | Expand 10 after
790 if (!toolbar_model_->GetInputInProgress() && 789 if (!toolbar_model_->GetInputInProgress() &&
791 toolbar_model_->WouldReplaceSearchURLWithSearchTerms()) { 790 toolbar_model_->WouldReplaceSearchURLWithSearchTerms()) {
792 const TemplateURL* template_url = 791 const TemplateURL* template_url =
793 TemplateURLServiceFactory::GetForProfile(profile_)-> 792 TemplateURLServiceFactory::GetForProfile(profile_)->
794 GetDefaultSearchProvider(); 793 GetDefaultSearchProvider();
795 if (template_url) 794 if (template_url)
796 return template_url->short_name(); 795 return template_url->short_name();
797 } 796 }
798 return string16(); 797 return string16();
799 } 798 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698