chrome/browser/ui/webui/chromeos/login/update_screen_handler.cc - Issue 498773003: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (part 2 …

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/chromeos/login/update_screen_handler.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/chromeos/login/terms_of_service_screen_handler.cc ('k') | chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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/chromeos/login/update_screen_handler.h"	5 #include "chrome/browser/ui/webui/chromeos/login/update_screen_handler.h"

6	6

7 #include "base/memory/scoped_ptr.h"	7 #include "base/memory/scoped_ptr.h"

8 #include "base/values.h"	8 #include "base/values.h"

9 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"	9 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"

10 #include "grit/chromium_strings.h"	10 #include "chrome/grit/chromium_strings.h"

11 #include "grit/generated_resources.h"	11 #include "chrome/grit/generated_resources.h"

12 #include "ui/base/l10n/l10n_util.h"	12 #include "ui/base/l10n/l10n_util.h"

13	13

14 namespace {	14 namespace {

15	15

16 const char kJsScreenPath[] = "login.UpdateScreen";	16 const char kJsScreenPath[] = "login.UpdateScreen";

17	17

18 } // namespace	18 } // namespace

19	19

20 namespace chromeos {	20 namespace chromeos {

21	21

(...skipping 119 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
141 screen_->OnConnectToNetworkRequested();	141 screen_->OnConnectToNetworkRequested();

142 }	142 }

143	143

144 #if !defined(OFFICIAL_BUILD)	144 #if !defined(OFFICIAL_BUILD)

145 void UpdateScreenHandler::HandleUpdateCancel() {	145 void UpdateScreenHandler::HandleUpdateCancel() {

146 screen_->CancelUpdate();	146 screen_->CancelUpdate();

147 }	147 }

148 #endif	148 #endif

149	149

150 } // namespace chromeos	150 } // namespace chromeos

OLD	NEW