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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: remoting/webapp/main.html

Issue 14803010: Add link to Hangouts Remote Desktop in the It2Me section of the remoting app. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 7 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
« remoting/webapp/butter_bar.js ('K') | « remoting/webapp/main.css ('k') | remoting/webapp/remoting.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <!doctype html> 1 <!doctype html>
2 <!-- 2 <!--
3 Copyright (c) 2012 The Chromium Authors. All rights reserved. 3 Copyright (c) 2012 The Chromium Authors. All rights reserved.
4 Use of this source code is governed by a BSD-style license that can be 4 Use of this source code is governed by a BSD-style license that can be
5 found in the LICENSE file. 5 found in the LICENSE file.
6 --> 6 -->
7 7
8 <html> 8 <html>
9 <head> 9 <head>
10 <meta charset="utf-8"> 10 <meta charset="utf-8">
11 <link rel="icon" type="image/png" href="chromoting16.webp"> 11 <link rel="icon" type="image/png" href="chromoting16.webp">
12 <link rel="stylesheet" href="open_sans.css"> 12 <link rel="stylesheet" href="open_sans.css">
13 <link rel="stylesheet" href="connection_stats.css"> 13 <link rel="stylesheet" href="connection_stats.css">
14 <link rel="stylesheet" href="connection_history.css"> 14 <link rel="stylesheet" href="connection_history.css">
15 <link rel="stylesheet" href="main.css"> 15 <link rel="stylesheet" href="main.css">
16 <link rel="stylesheet" href="menu_button.css"> 16 <link rel="stylesheet" href="menu_button.css">
17 <link rel="stylesheet" href="toolbar.css"> 17 <link rel="stylesheet" href="toolbar.css">
18 <script src="butter_bar.js"></script>
18 <script src="client_plugin.js"></script> 19 <script src="client_plugin.js"></script>
19 <script src="client_plugin_async.js"></script> 20 <script src="client_plugin_async.js"></script>
20 <script src="client_screen.js"></script> 21 <script src="client_screen.js"></script>
21 <script src="client_session.js"></script> 22 <script src="client_session.js"></script>
22 <script src="clipboard.js"></script> 23 <script src="clipboard.js"></script>
23 <script src="connection_history.js"></script> 24 <script src="connection_history.js"></script>
24 <script src="connection_stats.js"></script> 25 <script src="connection_stats.js"></script>
25 <script src="error.js"></script> 26 <script src="error.js"></script>
26 <script src="event_handlers.js"></script> 27 <script src="event_handlers.js"></script>
27 <script src="format_iq.js"></script> 28 <script src="format_iq.js"></script>
28 <script src="host.js"></script> 29 <script src="host.js"></script>
29 <script src="host_controller.js"></script> 30 <script src="host_controller.js"></script>
30 <script src="host_dispatcher.js"></script> 31 <script src="host_dispatcher.js"></script>
31 <script src="host_list.js"></script> 32 <script src="host_list.js"></script>
32 <script src="host_native_messaging.js"></script> 33 <script src="host_native_messaging.js"></script>
33 <script src="host_screen.js"></script> 34 <script src="host_screen.js"></script>
34 <script src="host_session.js"></script> 35 <script src="host_session.js"></script>
35 <script src="host_settings.js"></script> 36 <script src="host_settings.js"></script>
36 <script src="host_setup_dialog.js"></script> 37 <script src="host_setup_dialog.js"></script>
37 <script src="host_table_entry.js"></script> 38 <script src="host_table_entry.js"></script>
38 <script src="l10n.js"></script> 39 <script src="l10n.js"></script>
39 <script src="log_to_server.js"></script> 40 <script src="log_to_server.js"></script>
40 <script src="menu_button.js"></script> 41 <script src="menu_button.js"></script>
41 <script src="oauth2.js"></script> 42 <script src="oauth2.js"></script>
42 <script src="plugin_settings.js"></script> 43 <script src="plugin_settings.js"></script>
43 <script src="remoting.js"></script> 44 <script src="remoting.js"></script>
45 <script src="server_log_entry.js"></script>
44 <script src="session_connector.js"></script> 46 <script src="session_connector.js"></script>
45 <script src="server_log_entry.js"></script>
46 <script src="stats_accumulator.js"></script> 47 <script src="stats_accumulator.js"></script>
47 <script src="storage.js"></script> 48 <script src="storage.js"></script>
48 <script src="survey.js"></script>
49 <script src="third_party_host_permissions.js"></script> 49 <script src="third_party_host_permissions.js"></script>
50 <script src="third_party_token_fetcher.js"></script> 50 <script src="third_party_token_fetcher.js"></script>
51 <script src="toolbar.js"></script> 51 <script src="toolbar.js"></script>
52 <script src="ui_mode.js"></script> 52 <script src="ui_mode.js"></script>
53 <script src="xhr.js"></script> 53 <script src="xhr.js"></script>
54 <script src="wcs_sandbox_container.js"></script> 54 <script src="wcs_sandbox_container.js"></script>
55 <title i18n-content="PRODUCT_NAME"></title> 55 <title i18n-content="PRODUCT_NAME"></title>
56 </head> 56 </head>
57 57
58 <body> 58 <body>
(...skipping 23 matching lines...) Expand all
82 <!-- TODO(jamiewalch): Add this back in when we support it. 82 <!-- TODO(jamiewalch): Add this back in when we support it.
83 <a id="connection-history" 83 <a id="connection-history"
84 i18n-content="CONNECTION_HISTORY_BUTTON"></a> | 84 i18n-content="CONNECTION_HISTORY_BUTTON"></a> |
85 --> 85 -->
86 </span> 86 </span>
87 <a href="https://www.google.com/support/chrome/bin/answer.py?answer=1649 523" 87 <a href="https://www.google.com/support/chrome/bin/answer.py?answer=1649 523"
88 target="_blank" i18n-content="HELP"></a> 88 target="_blank" i18n-content="HELP"></a>
89 </div> 89 </div>
90 </header> 90 </header>
91 91
92 <div id="survey-opt-in" class="butter-bar" hidden> 92 <div id="butter-bar" hidden>
93 <p> 93 <p id="survey-invitation" hidden>
94 <span i18n-content="SURVEY_INVITATION"></span> 94 <span i18n-content="SURVEY_INVITATION"></span>
95 <a id="survey-accept" 95 <a id="survey-accept"
96 href="http://goo.gl/njH2q" 96 href="http://goo.gl/njH2q"
97 target="_blank" 97 target="_blank"
98 i18n-content="SIGN_ME_UP"></a> 98 i18n-content="SIGN_ME_UP"></a>
99 <a id="survey-decline" href="#"> 99 <a id="survey-dismiss" href="#">
100 <img src="icon_cross.webp" class="close-icon"></img> 100 <img src="icon_cross.webp" class="close-icon"></img>
101 </a> 101 </a>
102 </p> 102 </p>
103 <p id="hangouts-invitation" hidden>
104 <span i18n-content="HANGOUTS_INVITATION"
105 i18n-value-1="<a id='hangouts-accept' href='https://plus.google.co m/hangouts/_?gid=818572447316'>"
106 i18n-value-2="</a>"></span>
107 <a id="hangouts-dismiss" href="#">
108 <img src="icon_cross.webp" class="close-icon"></img>
109 </a>
110 </p>
103 </div> 111 </div>
104 112
105 <div data-ui-mode="home" hidden> 113 <div data-ui-mode="home" hidden>
106 114
107 <section> 115 <section>
108 <h2 i18n-content="MODE_IT2ME"></h2> 116 <h2 i18n-content="MODE_IT2ME"></h2>
109 <div id="it2me-first-run"> 117 <div id="it2me-first-run">
110 <div> 118 <div>
111 <p class="infographic-description" 119 <p class="infographic-description"
112 i18n-content="IT2ME_FIRST_RUN"></p> 120 i18n-content="IT2ME_FIRST_RUN"></p>
(...skipping 18 matching lines...) Expand all
131 class="small-print"></div> 139 class="small-print"></div>
132 </div> 140 </div>
133 <div> 141 <div>
134 <button id="share-button" 142 <button id="share-button"
135 i18n-content="HOME_SHARE_BUTTON" 143 i18n-content="HOME_SHARE_BUTTON"
136 class="kd-button-share" 144 class="kd-button-share"
137 type="button"> 145 type="button">
138 </button> 146 </button>
139 </div> 147 </div>
140 </div> 148 </div>
149 <div class="section-row">
150 <div i18n-content="HOME_ACCESS_DESCRIPTION"
151 class="box-spacer"></div>
152 <div>
153 <button id="access-mode-button"
154 i18n-content="HOME_ACCESS_BUTTON"
155 type="button">
156 </button>
157 </div>
158 </div>
Jamie 2013/05/23 20:31:46 Why has this block moved in the diff?
Sergey Ulanov 2013/05/29 23:36:11 Moved it back. There is redundant <div> around the
141 </div> 159 </div>
142 <div class="section-row">
143 <div i18n-content="HOME_ACCESS_DESCRIPTION"
144 class="box-spacer"></div>
145 <div>
146 <button id="access-mode-button"
147 i18n-content="HOME_ACCESS_BUTTON"
148 type="button">
149 </button>
150 </div>
151 </div>
152 </div> <!-- it2me-content --> 160 </div> <!-- it2me-content -->
153 </section> <!-- Remote Assistance --> 161 </section> <!-- Remote Assistance -->
154 162
155 <section id="host-list-div" class="host-list-container"> 163 <section id="host-list-div" class="host-list-container">
156 <h2 i18n-content="MODE_ME2ME"></h2> 164 <h2 i18n-content="MODE_ME2ME"></h2>
157 <div id="me2me-first-run"> 165 <div id="me2me-first-run">
158 <div> 166 <div>
159 <p class="infographic-description" 167 <p class="infographic-description"
160 i18n-content="ME2ME_FIRST_RUN"></p> 168 i18n-content="ME2ME_FIRST_RUN"></p>
161 <button id="get-started-me2me" 169 <button id="get-started-me2me"
(...skipping 547 matching lines...) Expand 10 before | Expand all | Expand 10 after
709 <div class="arrow-down"></div> 717 <div class="arrow-down"></div>
710 </div> 718 </div>
711 </div> <!-- session-toolbar --> 719 </div> <!-- session-toolbar -->
712 </div> <!-- session-mode --> 720 </div> <!-- session-mode -->
713 721
714 <div id="statistics" dir="ltr" class="selectable" hidden> 722 <div id="statistics" dir="ltr" class="selectable" hidden>
715 </div> <!-- statistics --> 723 </div> <!-- statistics -->
716 724
717 </body> 725 </body>
718 </html> 726 </html>
OLDNEW
« remoting/webapp/butter_bar.js ('K') | « remoting/webapp/main.css ('k') | remoting/webapp/remoting.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698