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

Side by Side Diff: chrome/browser/ui/webui/uber/uber_ui.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
« no previous file with comments | « chrome/browser/ui/webui/system_info_ui.cc ('k') | chrome/browser/ui/webui/version_handler.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #include "chrome/browser/ui/webui/uber/uber_ui.h" 5 #include "chrome/browser/ui/webui/uber/uber_ui.h"
6 6
7 #include "base/stl_util.h" 7 #include "base/stl_util.h"
8 #include "chrome/browser/chrome_notification_types.h" 8 #include "chrome/browser/chrome_notification_types.h"
9 #include "chrome/browser/extensions/extension_service.h" 9 #include "chrome/browser/extensions/extension_service.h"
10 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
11 #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h" 11 #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h"
12 #include "chrome/browser/ui/webui/extensions/extensions_ui.h" 12 #include "chrome/browser/ui/webui/extensions/extensions_ui.h"
13 #include "chrome/browser/ui/webui/options/options_ui.h" 13 #include "chrome/browser/ui/webui/options/options_ui.h"
14 #include "chrome/common/chrome_switches.h" 14 #include "chrome/common/chrome_switches.h"
15 #include "chrome/common/extensions/manifest_url_handler.h" 15 #include "chrome/common/extensions/manifest_url_handler.h"
16 #include "chrome/common/url_constants.h" 16 #include "chrome/common/url_constants.h"
17 #include "chrome/grit/chromium_strings.h"
18 #include "chrome/grit/generated_resources.h"
17 #include "content/public/browser/navigation_controller.h" 19 #include "content/public/browser/navigation_controller.h"
18 #include "content/public/browser/navigation_entry.h" 20 #include "content/public/browser/navigation_entry.h"
19 #include "content/public/browser/notification_source.h" 21 #include "content/public/browser/notification_source.h"
20 #include "content/public/browser/web_contents.h" 22 #include "content/public/browser/web_contents.h"
21 #include "content/public/browser/web_ui.h" 23 #include "content/public/browser/web_ui.h"
22 #include "content/public/browser/web_ui_data_source.h" 24 #include "content/public/browser/web_ui_data_source.h"
23 #include "extensions/browser/extension_registry.h" 25 #include "extensions/browser/extension_registry.h"
24 #include "extensions/common/extension_set.h" 26 #include "extensions/common/extension_set.h"
25 #include "grit/browser_resources.h" 27 #include "grit/browser_resources.h"
26 #include "grit/chromium_strings.h"
27 #include "grit/generated_resources.h"
28 28
29 using content::NavigationController; 29 using content::NavigationController;
30 using content::NavigationEntry; 30 using content::NavigationEntry;
31 using content::RenderViewHost; 31 using content::RenderViewHost;
32 using content::WebContents; 32 using content::WebContents;
33 33
34 namespace { 34 namespace {
35 35
36 content::WebUIDataSource* CreateUberHTMLSource() { 36 content::WebUIDataSource* CreateUberHTMLSource() {
37 content::WebUIDataSource* source = 37 content::WebUIDataSource* source =
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
222 web_ui()->CallJavascriptFunction( 222 web_ui()->CallJavascriptFunction(
223 "uber_frame.setNavigationOverride", 223 "uber_frame.setNavigationOverride",
224 base::StringValue(chrome::kChromeUIHistoryHost), 224 base::StringValue(chrome::kChromeUIHistoryHost),
225 base::StringValue(overrides_history ? "yes" : "no")); 225 base::StringValue(overrides_history ? "yes" : "no"));
226 break; 226 break;
227 } 227 }
228 default: 228 default:
229 NOTREACHED(); 229 NOTREACHED();
230 } 230 }
231 } 231 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/system_info_ui.cc ('k') | chrome/browser/ui/webui/version_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698