Skip to content
This repository has been archived by the owner on Apr 3, 2020. It is now read-only.

Remove invalid resources file entry from chromium resource_ids #48

Merged
merged 1 commit into from
Aug 12, 2013
Merged

Remove invalid resources file entry from chromium resource_ids #48

merged 1 commit into from
Aug 12, 2013

Conversation

nagineni
Copy link
Contributor

cameo_resources.grd file has been renamed to xwalk_resources.grd and
added to the xwalk resource_ids already. So, removing an invalid entry
from chromium resource_ids.

darktears added a commit that referenced this pull request Aug 12, 2013
Remove invalid resources file entry from chromium resource_ids
@darktears darktears merged commit a38b089 into crosswalk-project:master Aug 12, 2013
jeez pushed a commit to jeez/chromium-crosswalk that referenced this pull request Oct 2, 2013
Failed on mac-asan bot:
http://build.chromium.org/p/chromium.memory/builders/Mac%20ASAN%20Tests%20%281%29/builds/14510

AcceleratedCompositingBlockedTest.AcceleratedCompositingBlocked: 
[7719:3847:0909/155847:1828989999085:INFO:gpu_control_list.cc(1043)] Control list match for rule crosswalk-project#48.
[7719:3847:0909/155847:1829419815783:INFO:gpu_control_list.cc(1043)] Control list match for rule crosswalk-project#48.
[7719:3847:0909/155847:1829591550844:INFO:gpu_control_list.cc(1043)] Control list match for rule #.
../../chrome/test/gpu/gpu_feature_browsertest.cc:143: Failure
Value of: 0U
Actual: 0
Expected: event_count
Which is: 1

> Enable GPU blacklist in tests.
> 
> Partial re-land of https://codereview.chromium.org/22198004/) -- Always enable FCM on Windows -- Part 1/3.
> 
> On top of fixing some of the issues there; only lands the part that enables the GPU blacklist in tests as the former CL is too hard to land all at once.
> 
> Also keeping --skip-gpu-data-loading around for now to be able to deal with failures caused in layout_tests by this on their own later (this needs to land ASAP and layout_tests don't need this ASAP).
> 
> Another CL will follow to always enable FCM on non-blacklisted Windows machines.
> 
> This part re-enables loading the blacklist in tests (and adds a content_browsertest to make sure that the configuration we expect to be testing is indeed the one we are testing -- this uncertainty is basically the only reason the blacklist was explicitly disabled before).
> 
> This CL also cleans up compositor_util.cc which was enforcing the blacklist twice.
> 
> The original plan was to do this only for Windows as Mac/Linux was causing trouble, but it turns out to be harder to do it only on Windows; so taking care of http://crbug.com/277242 in this CL too after all... 
> 
> BUG=233830, 267038, 190942, 277242
> TBR=jcivelli, piman 
> 
> Originally Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=219132 
> Then Reverted: https://src.chromium.org/viewvc/chrome?view=rev&revision=219159
> 
> Then re-committed (part 1/3): https://src.chromium.org/viewvc/chrome?view=rev&revision=221114
> Reverted in: https://src.chromium.org/viewvc/chrome?view=rev&revision=221145
> 
> Review URL: https://chromiumcodereview.appspot.com/23534006

[email protected]

Review URL: https://codereview.chromium.org/23983019

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@222129 0039d316-1c4b-4281-b951-d872f2087c98
darktears pushed a commit that referenced this pull request Sep 29, 2014
…hset #5 id:100001 of https://codereview.chromium.org/516293007/)

Reason for revert:
Chrome OS build with DCHECKs enabled fails on start. This CL breaks assumption, that GAIA extension can be loaded without performing IO-operations.

Log and stack trace:
[16275:16275:0903/161435:WARNING:renderer_freezer.cc(55)] Cgroup freezer does not exist or is not writable. Processes will not be frozen during suspend.
[16275:16275:0903/161435:WARNING:configuration_policy_pref_store.cc(30)] Policy RemoteAccessClientFirewallTraversal: This policy has been deprecated.
[16275:16275:0903/161437:FATAL:thread_restrictions.cc(38)] Function marked as IO-only was called from a thread that disallows IO!  If this thread really should be allowed to make IO calls, adjust the call to base::ThreadRestrictions::SetIOAllowed() in this thread's startup.
#0 0x7fe3122e555e base::debug::StackTrace::StackTrace()
#1 0x7fe31237c462 logging::LogMessage::~LogMessage()
#2 0x7fe3124824af base::ThreadRestrictions::AssertIOAllowed()
#3 0x7fe3123630a1 base::PathExists()
#4 0x7fe321cfd5f3 extensions::(anonymous namespace)::CollectPlatformSpecificResourceArchs()
#5 0x7fe321cfad22 extensions::Extension::InitFromValue()
#6 0x7fe321cfa490 extensions::Extension::Create()
#7 0x7fe321cfa114 extensions::Extension::Create()
#8 0x7fe3233ebe1b extensions::ComponentLoader::Load()
#9 0x7fe3233ec3cf extensions::ComponentLoader::Add()
#10 0x7fe3233ec32a extensions::ComponentLoader::Add()
#11 0x7fe3233ec2b0 extensions::ComponentLoader::Add()
#12 0x7fe32437505f (anonymous namespace)::LoadGaiaAuthExtension()
#13 0x7fe324374d5e extensions::GaiaAuthExtensionLoader::LoadIfNeeded()
#14 0x7fe324237f7e ScopedGaiaAuthExtension::ScopedGaiaAuthExtension()
#15 0x7fe322f68bb2 chromeos::WebUILoginView::Init()
#16 0x7fe322f556ef chromeos::LoginDisplayHostImpl::InitLoginWindowAndView()
#17 0x7fe322f52640 chromeos::LoginDisplayHostImpl::LoadURL()
#18 0x7fe322f5226a chromeos::LoginDisplayHostImpl::StartWizard()
#19 0x7fe322f54acd chromeos::LoginDisplayHostImpl::StartPostponedWebUI()
#20 0x7fe322f541f8 chromeos::LoginDisplayHostImpl::Observe()
#21 0x7fe322f54bfd chromeos::LoginDisplayHostImpl::Observe()
#22 0x7fe31b222377 content::NotificationServiceImpl::Notify()
#23 0x7fe322d51a24 chromeos::(anonymous namespace)::UserWallpaperDelegate::OnWallpaperAnimationFinished()
#24 0x7fe31188692f ash::RootWindowController::OnWallpaperAnimationFinished()
#25 0x7fe3117c633a ash::(anonymous namespace)::ShowWallpaperAnimationObserver::OnImplicitAnimationsCompleted()
#26 0x7fe311f72d30 ui::ImplicitAnimationObserver::CheckCompleted()
#27 0x7fe311f72cd5 ui::ImplicitAnimationObserver::SetActive()
#28 0x7fe311f965d5 ui::ScopedLayerAnimationSettings::~ScopedLayerAnimationSettings()
#29 0x7fe3117c5ec7 ash::DesktopBackgroundWidgetController::StartAnimating()
#30 0x7fe3117bbb0c ash::DesktopBackgroundController::InstallDesktopController()
#31 0x7fe3117bbc03 ash::DesktopBackgroundController::InstallDesktopControllerForAllWindows()
#32 0x7fe3117bb3cc ash::DesktopBackgroundController::SetDesktopBackgroundImageMode()
#33 0x7fe3117bb096 ash::DesktopBackgroundController::SetWallpaperImage()
#34 0x7fe322f9a6b9 chromeos::WallpaperManager::DoSetDefaultWallpaper()
#35 0x7fe322f99b73 chromeos::WallpaperManager::PendingWallpaper::ProcessRequest()
#36 0x7fe322fbac72 base::internal::RunnableAdapter<>::Run()
#37 0x7fe322fbabe9 base::internal::InvokeHelper<>::MakeItSo()
#38 0x7fe322fbaba5 base::internal::Invoker<>::Run()
#39 0x7fe3122cc9ce base::Callback<>::Run()
#40 0x7fe312488f86 base::Timer::RunScheduledTask()
#41 0x7fe3124890bc base::BaseTimerTaskInternal::Run()
#42 0x7fe312489382 base::internal::RunnableAdapter<>::Run()
#43 0x7fe3124892ec base::internal::InvokeHelper<>::MakeItSo()
#44 0x7fe312489295 base::internal::Invoker<>::Run()
#45 0x7fe3122cc9ce base::Callback<>::Run()
#46 0x7fe3122eb9b3 base::debug::TaskAnnotator::RunTask()
#47 0x7fe3123a1c57 base::MessageLoop::RunTask()
#48 0x7fe3123a1d9b base::MessageLoop::DeferOrRunPendingTask()
#49 0x7fe3123a228d base::MessageLoop::DoDelayedWork()
#50 0x7fe3122a1f25 base::MessagePumpGlib::Run()
#51 0x7fe3123a17f0 base::MessageLoop::RunHandler()
#52 0x7fe3124093b2 base::RunLoop::Run()
#53 0x7fe324217e4d ChromeBrowserMainParts::MainMessageLoopRun()
#54 0x7fe31ad2a8bf content::BrowserMainLoop::RunMainMessageLoopParts()
#55 0x7fe31ad344c7 content::BrowserMainRunnerImpl::Run()
#56 0x7fe31ad251b1 content::BrowserMain()
#57 0x7fe31abb997f content::RunNamedProcessTypeMain()
#58 0x7fe31abbcce8 content::ContentMainRunnerImpl::Run()
#59 0x7fe31abb8ee5 content::ContentMain()
#60 0x7fe3206d3505 ChromeMain
#61 0x7fe3206d34b2 main

Cannot upload crash dump: cannot exec /sbin/crash_reporter

Crash_reporter failed to process crash report

Original issue's description:
> Enable forced extension updates on NaCl arch mismatch
>
> This makes extensions aware of the platforms for which
> they have platform-specific resources installed, if any.
>
> This also hooks up the extension update code with some
> additional logic to place an extension in forced-update
> mode if it has platform-specific resources which don't
> match the current NaCl architecture.
>
> BUG=409948
> TEST=install an extension which uses NaCl (QuickOffice for example). Rename the _platform-specific/<your-nacl-arch> directory some something else and force an update (e.g. via chrome://extensions button). Observe that a new CRX is downloaded and installed.
>
> Committed: https://chromium.googlesource.com/chromium/src/+/4a92281fa5d331860d65a59ba45dc882a5c71df4

[email protected],[email protected],[email protected],[email protected]
NOTREECHECKS=true
NOTRY=true
BUG=409948

Review URL: https://codereview.chromium.org/532183003

Cr-Commit-Position: refs/heads/master@{#293128}
darktears pushed a commit that referenced this pull request Sep 29, 2014
…::ExecuteCommands. (patchset #1 id:1 of https://codereview.chromium.org/547783002/)

Reason for revert:
Broke Linux ChromiumOS Tests (dbg)(3)

http://build.chromium.org/p/chromium.webkit/builders/Linux%20ChromiumOS%20Tests%20%28dbg%29%283%29/builds/1206

BrowserTestBase signal handler received SIGTERM. Backtrace:
#0 0x7f3bcf3aa67e base::debug::StackTrace::StackTrace()
#1 0x0000041c884a content::(anonymous namespace)::DumpStackTraceSignalHandler()
#2 0x7f3bc709f4a0 <unknown>
#3 0x7f3bc7151a43 __poll
#4 0x7f3bc7b8dff6 <unknown>
#5 0x7f3bc7b8e124 g_main_context_iteration
#6 0x7f3bcf366f35 base::MessagePumpGlib::Run()
#7 0x7f3bcf468180 base::MessageLoop::RunHandler()
#8 0x7f3bcf4cfcc2 base::RunLoop::Run()
#9 0x0000041e0729 content::RunThisRunLoop()
#10 0x0000041e06ba content::RunMessageLoop()
#11 0x000000668feb ExtensionApiTest::ResultCatcher::GetNextResult()
#12 0x0000006a30dd extensions::CommandsApiTest_ContinuePropagation_Test::RunTestOnMainThread()
#13 0x0000006a3712 extensions::CommandsApiTest_ContinuePropagation_Test::RunTestOnMainThread()
#14 0x00000176be8b InProcessBrowserTest::RunTestOnMainThreadLoop()
#15 0x0000041c85c8 content::BrowserTestBase::ProxyRunTestOnMainThreadLoop()
#16 0x0000041c9cf2 base::internal::RunnableAdapter<>::Run()
#17 0x0000041c9c69 base::internal::InvokeHelper<>::MakeItSo()
#18 0x0000041c9c25 base::internal::Invoker<>::Run()
#19 0x00000063f0de base::Callback<>::Run()
#20 0x0000042dddd2 ChromeBrowserMainParts::PreMainMessageLoopRunImpl()
#21 0x0000042dca92 ChromeBrowserMainParts::PreMainMessageLoopRun()
#22 0x000002e77daf chromeos::ChromeBrowserMainPartsChromeos::PreMainMessageLoopRun()
#23 0x7f3bd7bd2e96 content::BrowserMainLoop::PreMainMessageLoopRun()
#24 0x7f3bd7bd96f2 base::internal::RunnableAdapter<>::Run()
#25 0x7f3bd7bd965c base::internal::InvokeHelper<>::MakeItSo()
#26 0x7f3bd7bd960a base::internal::Invoker<>::Run()
#27 0x7f3bd80a852e base::Callback<>::Run()
#28 0x7f3bd841bd2b content::StartupTaskRunner::RunAllTasksNow()
#29 0x7f3bd7bd12f0 content::BrowserMainLoop::CreateStartupTasks()
#30 0x7f3bd7bdcc72 content::BrowserMainRunnerImpl::Initialize()
#31 0x7f3bd7bcda55 content::BrowserMain()
#32 0x7f3bd7a6224f content::RunNamedProcessTypeMain()
#33 0x7f3bd7a655b8 content::ContentMainRunnerImpl::Run()
#34 0x7f3bd7a617b5 content::ContentMain()
#35 0x0000041c82cb content::BrowserTestBase::SetUp()
#36 0x00000176afc3 InProcessBrowserTest::SetUp()
#37 0x000000674823 ExtensionBrowserTest::SetUp()
#38 0x000000674852 ExtensionBrowserTest::SetUp()
#39 0x0000018298a3 testing::internal::HandleSehExceptionsInMethodIfSupported<>()
#40 0x00000181686e testing::internal::HandleExceptionsInMethodIfSupported<>()
#41 0x00000180ad73 testing::Test::Run()
#42 0x00000180b4cb testing::TestInfo::Run()
#43 0x00000180baca testing::TestCase::Run()
#44 0x000001811009 testing::internal::UnitTestImpl::RunAllTests()
#45 0x0000018225b3 testing::internal::HandleSehExceptionsInMethodIfSupported<>()
#46 0x0000018185fe testing::internal::HandleExceptionsInMethodIfSupported<>()
#47 0x000001810c97 testing::UnitTest::Run()
#48 0x0000041a5531 RUN_ALL_TESTS()
#49 0x0000041a4547 base::TestSuite::Run()
#50 0x0000008026d2 InteractiveUITestSuiteRunner::RunTestSuite()
#51 0x000001769618 (anonymous namespace)::ChromeTestLauncherDelegate::RunTestSuite()
#52 0x0000041d9efb content::LaunchTests()
#53 0x00000176954b LaunchChromeTests()
#54 0x00000080262f main
#55 0x7f3bc708a76d __libc_start_main
#56 0x0000005ffda9 <unknown>
[123/334] CommandsApiTest.ContinuePropagation (TIMED OUT)

Original issue's description:
> Fixes HasEventListener check in ExtensionKeybindingRegistry::ExecuteCommands.
>
> ExtensionKeybindingRegistry::ExecuteCommands functions in two distinct ways -- execute all commands based on an accelerator, or, execute an accelerator for a given extension. The former behavior is implied by passing an empty string.
>
> Previously, only the latter case was handled when trying to continue propagating keys.
>
> BUG=407163
> TEST=try bots (interactive_ui_tests --gtest_filter=CommandsApiTest.*).
>
> Committed: https://chromium.googlesource.com/chromium/src/+/189a2ed4d209231d517b0e64a722722dead3f17a

[email protected],[email protected]
NOTREECHECKS=true
NOTRY=true
BUG=407163

Review URL: https://codereview.chromium.org/552533003

Cr-Commit-Position: refs/heads/master@{#293780}
rakuco pushed a commit that referenced this pull request Oct 10, 2014
Cr-Commit-Position: refs/branch-heads/2171@{#48}
Cr-Branched-From: 267aeeb-refs/heads/master@{#297060}
rakuco pushed a commit that referenced this pull request Jan 26, 2015
Cr-Commit-Position: refs/branch-heads/2272@{#48}
Cr-Branched-From: 827a380-refs/heads/master@{#310958}
rakuco pushed a commit that referenced this pull request Mar 12, 2015
Don't show "Kosovo" (country code "XK") as an autofill country name
option on K devices, because K devices are not aware of it.

Add "XK" to the list of autofill countries to enable saving autofill
profiles with country name "Kosovo."

BUG=456246
[email protected], [email protected]

Review URL: https://codereview.chromium.org/952993003

Cr-Commit-Position: refs/heads/master@{#318103}
(cherry picked from commit 6dbf9a7)

Review URL: https://codereview.chromium.org/963803002

Cr-Commit-Position: refs/branch-heads/2311@{#48}
Cr-Branched-From: 09b7de5-refs/heads/master@{#317474}
rakuco pushed a commit that referenced this pull request Apr 15, 2015
BUG=475072
[email protected]

Review URL: https://codereview.chromium.org/1066363003

Cr-Commit-Position: refs/heads/master@{#324268}
(cherry picked from commit e2f41fa)
[email protected]

Review URL: https://codereview.chromium.org/1078393002

Cr-Commit-Position: refs/branch-heads/2357@{#48}
Cr-Branched-From: 59d4494-refs/heads/master@{#323860}
rakuco pushed a commit that referenced this pull request Jun 8, 2015
The callback updates the |visible| property to NO so clients can
correctly determine if the context menu has been dismissed.

BUG=489121

Review URL: https://codereview.chromium.org/1144873002

Cr-Commit-Position: refs/heads/master@{#330562}
(cherry picked from commit 1f113f3)

Review URL: https://codereview.chromium.org/1151693004

Cr-Commit-Position: refs/branch-heads/2403@{#48}
Cr-Branched-From: f54b809-refs/heads/master@{#330231}
mrunalk pushed a commit that referenced this pull request Sep 22, 2015
This CL adds some utility functions that enable operating on common
UIKit and CoreGraphics data structures using the language-direction-
independent 'leading' and 'trailing' nomenclature.

These utilities will be used for iOS9 RTL support downstream.

BUG=520568

Review URL: https://codereview.chromium.org/1303013008

Cr-Commit-Position: refs/heads/master@{#345595}
(cherry picked from commit f642199)

Move all RTL-related layout utilities into a new file.

This CL moves all of the RTL-related utilities in ui_uitils.h and
uikit_utils.h into a new rtl_geometry.h, per suggestions in other
CLs.

BUG=525021

Review URL: https://codereview.chromium.org/1310553006

Cr-Commit-Position: refs/heads/master@{#345591}
(cherry picked from commit bcaa572)

Updates to LayoutRect API

Updates to the LayoutRect API as suggested by kkhorimoto@ in comments to
https://codereview.chromium.org/1304793002/

- Adds LayoutRectMake constructor.

- Adds LayoutRectZero constant.

- Renames fields: 'contextWidth' -> 'boundingWidth',
                  'yOrigin' -> 'originY'

- Renames function LayoutRectForRectInRectUsingDirection() ->
		   LayoutRectForRectInBoundingRectUsingDirection()

- Renames function LayoutRectForRectInRect() ->
		   LayoutRectForRectInBoundingRect()

- Renames function LayoutRectGetTrailing() ->
		   LayoutRectGetTrailingEdge()

- Corrects parameter name errors in comments.

BUG=

Review URL: https://codereview.chromium.org/1305013002

(cherry picked from commit c96804c)

Cr-Original-Commit-Position: refs/heads/master@{#345587}
Cr-Commit-Position: refs/branch-heads/2490@{#48}
Cr-Branched-From: 7790a35-refs/heads/master@{#344925}
rakuco pushed a commit that referenced this pull request Mar 3, 2016
Snackbar string is updated in this CL to show the folder destination of
the newly added offline page.

BUG=579220

Review URL: https://codereview.chromium.org/1603183002

Cr-Commit-Position: refs/heads/master@{#370233}
[email protected]

Review URL: https://codereview.chromium.org/1617943002 .

Cr-Commit-Position: refs/branch-heads/2623@{#48}
Cr-Branched-From: 92d7753-refs/heads/master@{#369907}
huningxin pushed a commit to huningxin/chromium-croswalk that referenced this pull request May 17, 2016
Cr-Commit-Position: refs/branch-heads/2661@{crosswalk-project#48}
Cr-Branched-From: ef6f6ae-refs/heads/master@{#378081}
fujunwei pushed a commit to fujunwei/chromium-crosswalk that referenced this pull request May 27, 2016
BUG=557469

Review URL: https://codereview.chromium.org/1453413002

Cr-Commit-Position: refs/heads/master@{#360414}
(cherry picked from commit b15a372)

Review URL: https://codereview.chromium.org/1457133003 .

Cr-Commit-Position: refs/branch-heads/2564@{crosswalk-project#48}
Cr-Branched-From: 1283eca-refs/heads/master@{#359700}
huningxin pushed a commit to huningxin/chromium-croswalk that referenced this pull request Oct 9, 2016
These will be used in a future CL
(https://codereview.chromium.org/1983803002). The strings are being
checked in early to ensure they are in before branch point.

Notry rationale: Tree is broken due to https://crbug.com/613258. All
other tests have passed on trybots.

BUG=610039
NOTRY=true

Review-Url: https://codereview.chromium.org/1995893002
Cr-Commit-Position: refs/heads/master@{#394968}
(cherry picked from commit 8386be4)

Review URL: https://codereview.chromium.org/2009503004 .

Cr-Commit-Position: refs/branch-heads/2743@{crosswalk-project#48}
Cr-Branched-From: 2b3ae3b-refs/heads/master@{#394939}
imreotto pushed a commit to tenta-browser/chromium-crosswalk that referenced this pull request Nov 2, 2017
After we add change error string more readable in
https://bugs.chromium.org/p/chromium/issues/detail?id=754743
subtitle can be multiple lines and break height calculation. 
Move title and subtitle into content and make content flex
display.

Remove empty spacing of error image so that UI is more robust
if we have multiple line subtitle in different languages.

[email protected]

Bug: 761518
Test: Manual. No UI accessibility regression.
Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
Change-Id: Ifc757f337fe93b1a55c1796c8ceb847d73e56d24
Reviewed-on: https://chromium-review.googlesource.com/648333
Reviewed-by: Xiyuan Xia <[email protected]>
Commit-Queue: Long Cheng <[email protected]>
Cr-Original-Commit-Position: refs/heads/master@{#499346}(cherry picked from commit 83767fe)
Reviewed-on: https://chromium-review.googlesource.com/653577
Reviewed-by: Long Cheng <[email protected]>
Cr-Commit-Position: refs/branch-heads/3202@{crosswalk-project#48}
Cr-Branched-From: fa6a5d8-refs/heads/master@{#499098}
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants