chrome/browser/resources/settings/settings_main/settings_main.html - Issue 1096143003: Add chrome.searchEnginesPrivate API and Search Settings page.

Side by Side Diff: chrome/browser/resources/settings/settings_main/settings_main.html

Issue 1096143003: Add chrome.searchEnginesPrivate API and Search Settings page. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Update OWNERS Created 5 years, 8 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

« no previous file with comments | « chrome/browser/resources/settings/search_page/search_page_style.html ('k') | chrome/browser/resources/settings/settings_resources.grd » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 <link rel="import" href="chrome://resources/polymer/polymer/polymer.html">	1 <link rel="import" href="chrome://resources/polymer/polymer/polymer.html">

2 <link rel="import" href="chrome://resources/polymer/core-animated-pages/core-ani mated-pages.html">	2 <link rel="import" href="chrome://resources/polymer/core-animated-pages/core-ani mated-pages.html">

3 <link rel="import" href="chrome://resources/polymer/core-transition/core-transit ion.html">	3 <link rel="import" href="chrome://resources/polymer/core-transition/core-transit ion.html">

4 <link rel="import" href="chrome://resources/polymer/paper-shadow/paper-shadow.ht ml">	4 <link rel="import" href="chrome://resources/polymer/paper-shadow/paper-shadow.ht ml">

5 <link rel="import" href="chrome://md-settings/a11y_page/a11y_page.html">	5 <link rel="import" href="chrome://md-settings/a11y_page/a11y_page.html">

6 <link rel="import" href="chrome://md-settings/date_time_page/date_time_page.html ">	6 <link rel="import" href="chrome://md-settings/date_time_page/date_time_page.html ">

7 <link rel="import" href="chrome://md-settings/downloads_page/downloads_page.html ">	7 <link rel="import" href="chrome://md-settings/downloads_page/downloads_page.html ">

8 <link rel="import" href="chrome://md-settings/internet_page/internet_page.html">	8 <link rel="import" href="chrome://md-settings/internet_page/internet_page.html">

	9 <link rel="import" href="chrome://md-settings/search_page/search_page.html">

9 <link rel="import" href="chrome://md-settings/routes.html">	10 <link rel="import" href="chrome://md-settings/routes.html">

10 <link rel="import" href="settings_main_style.html">	11 <link rel="import" href="settings_main_style.html">

11	12

12 <polymer-element name="cr-settings-main">	13 <polymer-element name="cr-settings-main">

13 <template>	14 <template>

14 <core-style ref="settingsMainStyle"></core-style>	15 <core-style ref="settingsMainStyle"></core-style>

15 <div id="mainContainer">	16 <div id="mainContainer">

16 <cr-settings-page-header selectedPage="{{$.pageContainer.selectedItem}}">	17 <cr-settings-page-header selectedPage="{{$.pageContainer.selectedItem}}">

17 </cr-settings-page-header>	18 </cr-settings-page-header>

18 <content select="core-icon-button"></content>	19 <content select="core-icon-button"></content>

19 <more-route-selector>	20 <more-route-selector>

20 <core-animated-pages id="pageContainer" selected="{{selectedPageId}}"	21 <core-animated-pages id="pageContainer" selected="{{selectedPageId}}"

21 valueattr="PAGE_ID" transitions="cross-fade">	22 valueattr="PAGE_ID" transitions="cross-fade">

22 <if expr="chromeos">	23 <if expr="chromeos">

23 <cr-settings-internet-page route="internet"></cr-settings-internet-pag e>	24 <cr-settings-internet-page route="internet"></cr-settings-internet-pag e>

24 </if>	25 </if>

25 <cr-settings-a11y-page prefs="{{prefs}}" route="a11y">	26 <cr-settings-a11y-page prefs="{{prefs}}" route="a11y">

26 </cr-settings-a11y-page>	27 </cr-settings-a11y-page>

27 <if expr="chromeos">	28 <if expr="chromeos">

28 <cr-settings-date-time-page prefs="{{prefs}}" route="dateTime">	29 <cr-settings-date-time-page prefs="{{prefs}}" route="dateTime">

29 </cr-settings-date-time-page>	30 </cr-settings-date-time-page>

30 </if>	31 </if>

31 <cr-settings-downloads-page prefs="{{prefs}}" route="downloads">	32 <cr-settings-downloads-page prefs="{{prefs}}" route="downloads">

32 </cr-settings-downloads-page>	33 </cr-settings-downloads-page>

	34 <cr-settings-search-page prefs="{{prefs}}" route="search">

	35 </cr-settings-search-page>

33 </core-animated-pages>	36 </core-animated-pages>

34 </more-route-selector>	37 </more-route-selector>

35 </div>	38 </div>

36 </template>	39 </template>

37 <script src="settings_main.js"></script>	40 <script src="settings_main.js"></script>

38 </polymer-element>	41 </polymer-element>

OLD	NEW