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

Side by Side Diff: chrome/browser/ui/location_bar/origin_chip_info.cc

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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/location_bar/origin_chip_info.h" 5 #include "chrome/browser/ui/location_bar/origin_chip_info.h"
6 6
7 #include "base/prefs/pref_service.h" 7 #include "base/prefs/pref_service.h"
8 #include "base/strings/string_util.h" 8 #include "base/strings/string_util.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "chrome/browser/extensions/extension_service.h" 10 #include "chrome/browser/extensions/extension_service.h"
11 #include "chrome/browser/extensions/extension_util.h" 11 #include "chrome/browser/extensions/extension_util.h"
12 #include "chrome/browser/profiles/profile.h" 12 #include "chrome/browser/profiles/profile.h"
13 #include "chrome/browser/safe_browsing/client_side_detection_host.h" 13 #include "chrome/browser/safe_browsing/client_side_detection_host.h"
14 #include "chrome/browser/safe_browsing/safe_browsing_tab_observer.h" 14 #include "chrome/browser/safe_browsing/safe_browsing_tab_observer.h"
15 #include "chrome/browser/ui/toolbar/toolbar_model.h" 15 #include "chrome/browser/ui/toolbar/toolbar_model.h"
16 #include "chrome/common/extensions/extension_constants.h" 16 #include "chrome/common/extensions/extension_constants.h"
17 #include "chrome/common/pref_names.h" 17 #include "chrome/common/pref_names.h"
18 #include "chrome/common/url_constants.h" 18 #include "chrome/common/url_constants.h"
19 #include "chrome/grit/chromium_strings.h"
20 #include "chrome/grit/generated_resources.h"
19 #include "content/public/browser/web_contents.h" 21 #include "content/public/browser/web_contents.h"
20 #include "extensions/browser/extension_icon_image.h" 22 #include "extensions/browser/extension_icon_image.h"
21 #include "extensions/browser/extension_system.h" 23 #include "extensions/browser/extension_system.h"
22 #include "extensions/common/constants.h" 24 #include "extensions/common/constants.h"
23 #include "extensions/common/manifest_handlers/icons_handler.h" 25 #include "extensions/common/manifest_handlers/icons_handler.h"
24 #include "grit/chromium_strings.h"
25 #include "grit/components_strings.h" 26 #include "grit/components_strings.h"
26 #include "grit/generated_resources.h"
27 #include "grit/theme_resources.h" 27 #include "grit/theme_resources.h"
28 #include "net/base/net_util.h" 28 #include "net/base/net_util.h"
29 #include "ui/base/l10n/l10n_util.h" 29 #include "ui/base/l10n/l10n_util.h"
30 #include "url/gurl.h" 30 #include "url/gurl.h"
31 31
32 namespace { 32 namespace {
33 33
34 // For selected kChromeUIScheme and url::kAboutScheme, return the string 34 // For selected kChromeUIScheme and url::kAboutScheme, return the string
35 // resource 35 // resource
36 // number for the title of the page. If we don't have a specialized title, 36 // number for the title of the page. If we don't have a specialized title,
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 251
252 #if defined(OS_CHROMEOS) 252 #if defined(OS_CHROMEOS)
253 if (url.SchemeIs(chrome::kCrosScheme) || 253 if (url.SchemeIs(chrome::kCrosScheme) ||
254 url.SchemeIs(chrome::kDriveScheme)) 254 url.SchemeIs(chrome::kDriveScheme))
255 return base::UTF8ToUTF16(url.spec()); 255 return base::UTF8ToUTF16(url.spec());
256 #endif 256 #endif
257 257
258 // If all else fails, return the hostname. 258 // If all else fails, return the hostname.
259 return base::UTF8ToUTF16(url.host()); 259 return base::UTF8ToUTF16(url.host());
260 } 260 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698