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

Issues Search
    My Issues | Starred     Open | Closed | All

Issue 2673943002: Fold UpdateModel into UpdateScreen. (Closed)

Created:
3 years, 10 months ago by jdufault
Modified:
3 years, 10 months ago
Reviewers:
achuithb
CC:
chromium-reviews, alemate+watch_chromium.org, achuith+watch_chromium.org, oshima+watch_chromium.org, davemoore+watch_chromium.org
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

Fold UpdateModel into UpdateScreen. BUG=672142 Review-Url: https://codereview.chromium.org/2673943002 Cr-Commit-Position: refs/heads/master@{#448447} Committed: https://chromium.googlesource.com/chromium/src/+/eed833f5e4ec040342c08755bad3f45c3a0b8ab6

Patch Set 1 #

Total comments: 10

Patch Set 2 : Rebase #

Patch Set 3 : Address comments #

Unified diffs Side-by-side diffs Delta from patch set Stats (+178 lines, -247 lines) Patch
M chrome/browser/chromeos/BUILD.gn View 1 1 chunk +0 lines, -2 lines 0 comments Download
M chrome/browser/chromeos/login/screens/mock_update_screen.h View 2 chunks +3 lines, -4 lines 0 comments Download
M chrome/browser/chromeos/login/screens/mock_update_screen.cc View 1 chunk +7 lines, -7 lines 0 comments Download
D chrome/browser/chromeos/login/screens/update_model.h View 1 chunk +0 lines, -37 lines 0 comments Download
D chrome/browser/chromeos/login/screens/update_model.cc View 1 chunk +0 lines, -27 lines 0 comments Download
M chrome/browser/chromeos/login/screens/update_screen.h View 1 2 4 chunks +32 lines, -28 lines 0 comments Download
M chrome/browser/chromeos/login/screens/update_screen.cc View 1 2 11 chunks +119 lines, -123 lines 0 comments Download
M chrome/browser/chromeos/login/screens/update_view.h View 1 2 2 chunks +4 lines, -4 lines 0 comments Download
M chrome/browser/ui/webui/chromeos/login/update_screen_handler.h View 1 2 2 chunks +5 lines, -5 lines 0 comments Download
M chrome/browser/ui/webui/chromeos/login/update_screen_handler.cc View 3 chunks +8 lines, -10 lines 0 comments Download

Dependent Patchsets:

Issue 2676323003 Patch 1

Messages

Total messages: 16 (10 generated)
jdufault
achuith@ PTAL. There should be no functional changes in this CL.
3 years, 10 months ago (2017-02-03 20:53:11 UTC) #7
achuithb
lgtm https://codereview.chromium.org/2673943002/diff/1/chrome/browser/chromeos/login/screens/update_screen.cc File chrome/browser/chromeos/login/screens/update_screen.cc (right): https://codereview.chromium.org/2673943002/diff/1/chrome/browser/chromeos/login/screens/update_screen.cc#newcode386 chrome/browser/chromeos/login/screens/update_screen.cc:386: base::OneShotTimer& UpdateScreen::GetErrorMessageTimerForTesting() { This should return a pointer, ...
3 years, 10 months ago (2017-02-03 22:36:44 UTC) #8
jdufault
https://codereview.chromium.org/2673943002/diff/1/chrome/browser/chromeos/login/screens/update_screen.cc File chrome/browser/chromeos/login/screens/update_screen.cc (right): https://codereview.chromium.org/2673943002/diff/1/chrome/browser/chromeos/login/screens/update_screen.cc#newcode386 chrome/browser/chromeos/login/screens/update_screen.cc:386: base::OneShotTimer& UpdateScreen::GetErrorMessageTimerForTesting() { On 2017/02/03 22:36:43, achuithb wrote: > ...
3 years, 10 months ago (2017-02-06 22:30:48 UTC) #11
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.org/2673943002/40001
3 years, 10 months ago (2017-02-06 22:31:44 UTC) #12
commit-bot: I haz the power
Committed patchset #3 (id:40001) as https://chromium.googlesource.com/chromium/src/+/eed833f5e4ec040342c08755bad3f45c3a0b8ab6
3 years, 10 months ago (2017-02-06 23:57:06 UTC) #15
jdufault
3 years, 10 months ago (2017-02-07 00:37:35 UTC) #16
Message was sent while issue was closed. 
A revert of this CL (patchset #3 id:40001) has been created in
https://codereview.chromium.org/2684473002/ by jdufault@chromium.org.

The reason for reverting is: Broke compile

FAILED: obj/chrome/browser/chromeos/chromeos/update_screen.o 
/b/c/cipd/goma/gomacc ../../third_party/llvm-build/Release+Asserts/bin/clang++
-MMD -MF obj/chrome/browser/chromeos/chromeos/update_screen.o.d
-DV8_DEPRECATION_WARNINGS -DUSE_UDEV -DUI_COMPOSITOR_IMAGE_TRANSPORT -DUSE_ASH=1
-DUSE_AURA=1 -DUSE_PANGO=1 -DUSE_CAIRO=1 -DUSE_GLIB=1 -DUSE_NSS_CERTS=1
-DUSE_X11=1 -DENABLE_WAYLAND_SERVER=1 -DFULL_SAFE_BROWSING -DSAFE_BROWSING_CSD
-DSAFE_BROWSING_DB_LOCAL -DOFFICIAL_BUILD -DGOOGLE_CHROME_BUILD
-DENABLE_MEDIA_ROUTER=1 -DCR_CLANG_REVISION=289944-2 -D_FILE_OFFSET_BITS=64
-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -DNO_UNWIND_TABLES
-D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D_FORTIFY_SOURCE=2
-DOS_CHROMEOS -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0
-DGL_GLEXT_PROTOTYPES -DUSE_GLX -DUSE_EGL -DTOOLKIT_VIEWS=1
-DGOOGLE_PROTOBUF_NO_RTTI -DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER -DHAVE_PTHREAD
-DSK_IGNORE_DW_GRAY_FIX -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS
-DSK_SUPPORT_GPU=1 -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0
-DU_STATIC_IMPLEMENTATION -DICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE
-DV8_USE_EXTERNAL_STARTUP_DATA -DLEVELDB_PLATFORM_CHROMIUM=1
-DFEATURE_ENABLE_VOICEMAIL -DEXPAT_RELATIVE_PATH -DGTEST_RELATIVE_PATH
-DNO_MAIN_THREAD_WRAPPING -DNO_SOUND_SYSTEM -DWEBRTC_CHROMIUM_BUILD
-DWEBRTC_POSIX -DWEBRTC_LINUX -DCHROMEOS -DNO_MAIN_THREAD_WRAPPING -I../.. -Igen
-I../../build/linux/ubuntu_precise_amd64-sysroot/usr/include/glib-2.0
-I../../build/linux/ubuntu_precise_amd64-sysroot/usr/lib/x86_64-linux-gnu/glib-2.0/include
-I../../third_party/khronos -I../../gpu -I../../third_party/protobuf/src
-Igen/protoc_out -I../../third_party/protobuf/src -Igen/ash/common/strings
-Igen/ash/resources -Igen/chrome -Igen/chrome -Igen/chrome -Igen/chrome
-I../../skia/config -I../../skia/ext -I../../third_party/skia/include/c
-I../../third_party/skia/include/config -I../../third_party/skia/include/core
-I../../third_party/skia/include/effects -I../../third_party/skia/include/images
-I../../third_party/skia/include/lazy -I../../third_party/skia/include/pathops
-I../../third_party/skia/include/pdf -I../../third_party/skia/include/pipe
-I../../third_party/skia/include/ports -I../../third_party/skia/include/utils
-I../../third_party/skia/include/gpu -I../../third_party/skia/src/gpu
-I../../third_party/skia/src/sksl -Igen/ui/chromeos/resources
-Igen/ui/chromeos/strings -Igen/ui/resources -Igen/ui/resources -Igen
-I../../third_party/ced/src -I../../third_party/icu/source/common
-I../../third_party/icu/source/i18n -I../../third_party/boringssl/src/include
-Igen/components/metrics/proto
-I../../build/linux/ubuntu_precise_amd64-sysroot/usr/include/nss
-I../../build/linux/ubuntu_precise_amd64-sysroot/usr/include/nspr
-Igen/components/strings -Igen/components/strings -Igen/components/strings
-Igen/components/strings -I../../third_party/libwebm/source -Igen
-I../../third_party/WebKit -Igen/third_party/WebKit -I../../v8/include
-Igen/v8/include -I../../third_party/re2/src
-I../../third_party/mesa/src/include -Igen/extensions -Igen/extensions
-Igen/extensions -Igen -Igen/extensions/strings
-I../../build/linux/ubuntu_precise_amd64-sysroot/usr/include/dbus-1.0
-I../../build/linux/ubuntu_precise_amd64-sysroot/usr/lib/x86_64-linux-gnu/dbus-1.0/include
-Igen -Igen/components -Igen/components
-I../../third_party/cacheinvalidation/overrides
-I../../third_party/cacheinvalidation/src -I../../third_party/leveldatabase
-I../../third_party/leveldatabase/src
-I../../third_party/leveldatabase/src/include
-I../../third_party/webrtc_overrides -I../../testing/gtest/include
-I../../third_party -I../../third_party/webrtc_overrides -I../../third_party
-I../../third_party/libusb/src/libusb -I../../third_party/zlib
-Igen/ui/views/resources -Igen/ui/file_manager -I../../v8/include
-Igen/v8/include -fno-strict-aliasing -fno-unwind-tables
-fno-asynchronous-unwind-tables -fPIC -pipe
-B../../third_party/binutils/Linux_x64/Release/bin -fcolor-diagnostics
-fdebug-prefix-map=/b/c/b/Google_Chrome_ChromeOS/src=. -m64 -march=x86-64
-pthread -Wall -Werror -Wextra -Wno-missing-field-initializers
-Wno-unused-parameter -Wno-c++11-narrowing -Wno-covered-switch-default
-Wno-deprecated-register -Wno-unneeded-internal-declaration
-Wno-inconsistent-missing-override -Wno-shift-negative-value
-Wno-undefined-var-template -Wno-nonportable-include-path
-Wno-address-of-packed-member -O2 -fno-ident -fdata-sections -ffunction-sections
-g2 --sysroot=../../build/linux/ubuntu_precise_amd64-sysroot -fvisibility=hidden
-Xclang -load -Xclang
../../third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.so -Xclang
-add-plugin -Xclang find-bad-constructs -Xclang -plugin-arg-find-bad-constructs
-Xclang check-ipc -Wheader-hygiene -Wstring-conversion
-Wtautological-overlap-compare -Wexit-time-destructors -Wno-header-guard
-fvisibility-inlines-hidden -std=gnu++11 -Wno-reserved-user-defined-literal
-fno-rtti -fno-exceptions -c
../../chrome/browser/chromeos/login/screens/update_screen.cc -o
obj/chrome/browser/chromeos/chromeos/update_screen.o
../../chrome/browser/chromeos/login/screens/update_screen.cc:38:22: error:
unused variable 'kUserActionCancelUpdateShortcut'
[-Werror,-Wunused-const-variable]
constexpr const char kUserActionCancelUpdateShortcut[] = "cancel-update";
                     ^
../../chrome/browser/chromeos/login/screens/update_screen.cc:46:22: error:
unused variable 'kContextKeyCancelUpdateShortcutEnabled'
[-Werror,-Wunused-const-variable]
constexpr const char kContextKeyCancelUpdateShortcutEnabled[] =.

Powered by Google App Engine
This is Rietveld 408576698