chrome/browser/ui/webui/uber/uber_ui.cc - Issue 10837331: Options: s/options2/options/.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/ui/webui/uber/uber_ui.cc

Issue 10837331: Options: s/options2/options/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: wut Created 8 years, 4 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/sync_setup_handler.h ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

OLD	NEW
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 "base/utf_string_conversions.h"	8 #include "base/utf_string_conversions.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_url_data_manager.h"	11 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"

12 #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h"	12 #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h"

13 #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h"	13 #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h"

14 #include "chrome/browser/ui/webui/extensions/extensions_ui.h"	14 #include "chrome/browser/ui/webui/extensions/extensions_ui.h"

15 #include "chrome/browser/ui/webui/options2/options_ui.h"	15 #include "chrome/browser/ui/webui/options/options_ui.h"

16 #include "chrome/common/chrome_notification_types.h"	16 #include "chrome/common/chrome_notification_types.h"

17 #include "chrome/common/extensions/extension.h"	17 #include "chrome/common/extensions/extension.h"

18 #include "chrome/common/extensions/extension_set.h"	18 #include "chrome/common/extensions/extension_set.h"

19 #include "chrome/common/url_constants.h"	19 #include "chrome/common/url_constants.h"

20 #include "content/public/browser/navigation_controller.h"	20 #include "content/public/browser/navigation_controller.h"

21 #include "content/public/browser/navigation_entry.h"	21 #include "content/public/browser/navigation_entry.h"

22 #include "content/public/browser/notification_source.h"	22 #include "content/public/browser/notification_source.h"

23 #include "content/public/browser/web_contents.h"	23 #include "content/public/browser/web_contents.h"

24 #include "content/public/browser/web_ui.h"	24 #include "content/public/browser/web_ui.h"

25 #include "grit/browser_resources.h"	25 #include "grit/browser_resources.h"

(...skipping 205 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
231 scoped_ptr<Value> overrideValue(	231 scoped_ptr<Value> overrideValue(

232 Value::CreateStringValue(overridesHistory ? "yes" : "no"));	232 Value::CreateStringValue(overridesHistory ? "yes" : "no"));

233 web_ui()->CallJavascriptFunction(	233 web_ui()->CallJavascriptFunction(

234 "uber_frame.setNavigationOverride", controlsValue, overrideValue);	234 "uber_frame.setNavigationOverride", controlsValue, overrideValue);

235 break;	235 break;

236 }	236 }

237 default:	237 default:

238 NOTREACHED();	238 NOTREACHED();

239 }	239 }

240 }	240 }

OLD	NEW